From 8a30248ddb3592ea6d2f844631a7125b4270089c Mon Sep 17 00:00:00 2001 From: Phil Asmar Date: Tue, 15 Oct 2024 18:28:50 -0400 Subject: [PATCH] chore: Update config files to support GitHub CI for V4 --- .github/workflows/aws-ci.yml | 4 ++-- .github/workflows/create-release-pr.yml | 6 +++--- .github/workflows/sync-main-dev.yml | 26 ++++++++++++------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/aws-ci.yml b/.github/workflows/aws-ci.yml index f35e624..05bc99c 100644 --- a/.github/workflows/aws-ci.yml +++ b/.github/workflows/aws-ci.yml @@ -4,8 +4,8 @@ on: workflow_dispatch: pull_request: branches: - - master - - dev + - v4sdk-release # Change to `master` when V4 is GA + - v4sdk-development # Change to `dev` when V4 is GA - 'feature/**' permissions: diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index 2591e5f..a843c59 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -1,8 +1,8 @@ # This GitHub Workflow will create a new release branch that contains the updated C# project versions and changelog. -# The workflow will also create a PR that targets `dev` from the release branch. +# The workflow will also create a PR that targets `v4sdk-development` from the release branch. name: Create Release PR -# This workflow is manually triggered when in preparation for a release. The workflow should be dispatched from the `dev` branch. +# This workflow is manually triggered when in preparation for a release. The workflow should be dispatched from the `v4sdk-development` branch. on: workflow_dispatch: inputs: @@ -96,6 +96,6 @@ jobs: env: GITHUB_TOKEN: ${{ env.AWS_SECRET_TOKEN }} run: | - pr_url="$(gh pr create --title "${{ steps.read-release-name.outputs.VERSION }}" --body "${{ steps.read-changelog.outputs.CHANGELOG }}" --base dev --head ${{ steps.create-release-branch.outputs.BRANCH }})" + pr_url="$(gh pr create --title "${{ steps.read-release-name.outputs.VERSION }}" --body "${{ steps.read-changelog.outputs.CHANGELOG }}" --base v4sdk-development --head ${{ steps.create-release-branch.outputs.BRANCH }})" gh label create "Release PR" --description "A Release PR that includes versioning and changelog changes" -c "#FF0000" -f gh pr edit $pr_url --add-label "Release PR" \ No newline at end of file diff --git a/.github/workflows/sync-main-dev.yml b/.github/workflows/sync-main-dev.yml index e7e4a84..01b054d 100644 --- a/.github/workflows/sync-main-dev.yml +++ b/.github/workflows/sync-main-dev.yml @@ -1,7 +1,7 @@ # This GitHub Workflow is designed to run automatically after the Release PR, which was created by the `Create Release PR` workflow, is closed. # This workflow has 2 jobs. One will run if the `Release PR` is successfully merged, indicating that a release should go out. # The other will run if the `Release PR` was closed and a release is not intended to go out. -name: Sync 'dev' and 'master' +name: Sync 'v4sdk-development' and 'v4sdk-release' # The workflow will automatically be triggered when any PR is closed. on: @@ -13,15 +13,15 @@ permissions: id-token: write jobs: - # This job will check if the PR was successfully merged, it's source branch is `releases/next-release` and target branch is `dev`. + # This job will check if the PR was successfully merged, it's source branch is `releases/next-release` and target branch is `v4sdk-development`. # This indicates that the merged PR was the `Release PR`. - # This job will synchronize `dev` and `master`, create a GitHub Release and delete the `releases/next-release` branch. + # This job will synchronize `v4sdk-development` and `v4sdk-release`, create a GitHub Release and delete the `releases/next-release` branch. sync-dev-and-main: - name: Sync dev and master + name: Sync v4sdk-development and v4sdk-release if: | github.event.pull_request.merged == true && github.event.pull_request.head.ref == 'releases/next-release' && - github.event.pull_request.base.ref == 'dev' + github.event.pull_request.base.ref == 'v4sdk-development' runs-on: ubuntu-latest steps: # Assume an AWS Role that provides access to the Access Token @@ -41,7 +41,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - ref: dev + ref: v4sdk-development fetch-depth: 0 token: ${{ env.AWS_SECRET_TOKEN }} # Install .NET8 which is needed for AutoVer @@ -75,13 +75,13 @@ jobs: run: | changelog=$(autover changelog --output-to-console) echo "CHANGELOG<> "$GITHUB_OUTPUT" - # Merge dev into master in order to synchronize the 2 branches - - name: Merge dev to master + # Merge v4sdk-development into v4sdk-release in order to synchronize the 2 branches + - name: Merge v4sdk-development to v4sdk-release run: | git fetch origin - git checkout master - git merge dev - git push origin master + git checkout v4sdk-release + git merge v4sdk-development + git push origin v4sdk-release # Create the GitHub Release - name: Create GitHub Release env: @@ -93,7 +93,7 @@ jobs: run: | git fetch origin git push origin --delete releases/next-release - # This job will check if the PR was closed, it's source branch is `releases/next-release` and target branch is `dev`. + # This job will check if the PR was closed, it's source branch is `releases/next-release` and target branch is `v4sdk-development`. # This indicates that the closed PR was the `Release PR`. # This job will delete the tag created by AutoVer and the release branch. clean-up-closed-release: @@ -101,7 +101,7 @@ jobs: if: | github.event.pull_request.merged == false && github.event.pull_request.head.ref == 'releases/next-release' && - github.event.pull_request.base.ref == 'dev' + github.event.pull_request.base.ref == 'v4sdk-development' runs-on: ubuntu-latest steps: # Checkout a full clone of the repo