From 6d7a45cfab512252405a00d3e52b24e7ab32f3f9 Mon Sep 17 00:00:00 2001 From: John White <750350+johnhwhite@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:15:03 -0500 Subject: [PATCH] chore: create 9.x.x LTS branch --- .github/workflows/cherry-pick.yml | 7 ++++--- .github/workflows/ci.yml | 2 +- .github/workflows/release-please.yml | 2 +- .skyuxdev.json | 2 +- nx.json | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cherry-pick.yml b/.github/workflows/cherry-pick.yml index 4039456b..612756a1 100644 --- a/.github/workflows/cherry-pick.yml +++ b/.github/workflows/cherry-pick.yml @@ -4,7 +4,7 @@ on: types: - closed branches: - - 8.x.x + - 9.x.x env: TARGET_BRANCH: main @@ -39,8 +39,9 @@ jobs: - name: Cherry pick run: | - git config user.name 'Blackbaud Sky Build User' - git config user.email 'sky-build-user@blackbaud.com' + # Set the git user to the author of the merge commit. + git config user.name "$(git log -1 --pretty=format:'%an' ${{ github.event.pull_request.merge_commit_sha }})" + git config user.email "$(git log -1 --pretty=format:'%ae' ${{ github.event.pull_request.merge_commit_sha }})" # Echo commands to the log. set -x diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ab99feb..ba7a000b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - main + - 9.x.x pull_request: env: diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index d1e00182..818ae4e4 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: push: branches: - - main + - 9.x.x env: PRERELEASE: 'false' MAJOR_VERSION: 9 diff --git a/.skyuxdev.json b/.skyuxdev.json index 37a4f3ad..61e4fbdd 100644 --- a/.skyuxdev.json +++ b/.skyuxdev.json @@ -1,5 +1,5 @@ { - "baseBranch": "main", + "baseBranch": "9.x.x", "documentationExcludeProjects": [ "clipboard", "code-block", diff --git a/nx.json b/nx.json index 99206d14..1a09f3ca 100644 --- a/nx.json +++ b/nx.json @@ -1,7 +1,7 @@ { "$schema": "./node_modules/nx/schemas/nx-schema.json", "affected": { - "defaultBase": "main" + "defaultBase": "9.x.x" }, "tasksRunnerOptions": { "default": {