Skip to content

Commit 336a153

Browse files
committed
chore: Update config files to support GitHub CI for V4
1 parent 8bfeb65 commit 336a153

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.github/workflows/aws-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
workflow_dispatch:
55
pull_request:
66
branches:
7-
- master
8-
- dev
7+
- v4sdk-release # Change to `master` when V4 is GA
8+
- v4sdk-development # Change to `dev` when V4 is GA
99
- 'feature/**'
1010

1111
permissions:

.github/workflows/create-release-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This GitHub Workflow will create a new release branch that contains the updated C# project versions and changelog.
2-
# The workflow will also create a PR that targets `dev` from the release branch.
2+
# The workflow will also create a PR that targets `v4sdk-development` from the release branch.
33
name: Create Release PR
44

5-
# This workflow is manually triggered when in preparation for a release. The workflow should be dispatched from the `dev` branch.
5+
# This workflow is manually triggered when in preparation for a release. The workflow should be dispatched from the `v4sdk-development` branch.
66
on:
77
workflow_dispatch:
88
inputs:
@@ -96,6 +96,6 @@ jobs:
9696
env:
9797
GITHUB_TOKEN: ${{ env.AWS_SECRET_TOKEN }}
9898
run: |
99-
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 }})"
99+
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 }})"
100100
gh label create "Release PR" --description "A Release PR that includes versioning and changelog changes" -c "#FF0000" -f
101101
gh pr edit $pr_url --add-label "Release PR"

.github/workflows/sync-main-dev.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This GitHub Workflow is designed to run automatically after the Release PR, which was created by the `Create Release PR` workflow, is closed.
22
# This workflow has 2 jobs. One will run if the `Release PR` is successfully merged, indicating that a release should go out.
33
# The other will run if the `Release PR` was closed and a release is not intended to go out.
4-
name: Sync 'dev' and 'master'
4+
name: Sync 'v4sdk-development' and 'v4sdk-release'
55

66
# The workflow will automatically be triggered when any PR is closed.
77
on:
@@ -13,15 +13,15 @@ permissions:
1313
id-token: write
1414

1515
jobs:
16-
# This job will check if the PR was successfully merged, it's source branch is `releases/next-release` and target branch is `dev`.
16+
# This job will check if the PR was successfully merged, it's source branch is `releases/next-release` and target branch is `v4sdk-development`.
1717
# This indicates that the merged PR was the `Release PR`.
18-
# This job will synchronize `dev` and `master`, create a GitHub Release and delete the `releases/next-release` branch.
18+
# This job will synchronize `v4sdk-development` and `v4sdk-release`, create a GitHub Release and delete the `releases/next-release` branch.
1919
sync-dev-and-main:
20-
name: Sync dev and master
20+
name: Sync v4sdk-development and v4sdk-release
2121
if: |
2222
github.event.pull_request.merged == true &&
2323
github.event.pull_request.head.ref == 'releases/next-release' &&
24-
github.event.pull_request.base.ref == 'dev'
24+
github.event.pull_request.base.ref == 'v4sdk-development'
2525
runs-on: ubuntu-latest
2626
steps:
2727
# Assume an AWS Role that provides access to the Access Token
@@ -41,7 +41,7 @@ jobs:
4141
- name: Checkout code
4242
uses: actions/checkout@v4
4343
with:
44-
ref: dev
44+
ref: v4sdk-development
4545
fetch-depth: 0
4646
token: ${{ env.AWS_SECRET_TOKEN }}
4747
# Install .NET8 which is needed for AutoVer
@@ -75,13 +75,13 @@ jobs:
7575
run: |
7676
changelog=$(autover changelog --output-to-console)
7777
echo "CHANGELOG<<EOF"$'\n'"$changelog"$'\n'EOF >> "$GITHUB_OUTPUT"
78-
# Merge dev into master in order to synchronize the 2 branches
79-
- name: Merge dev to master
78+
# Merge v4sdk-development into v4sdk-release in order to synchronize the 2 branches
79+
- name: Merge v4sdk-development to v4sdk-release
8080
run: |
8181
git fetch origin
82-
git checkout master
83-
git merge dev
84-
git push origin master
82+
git checkout v4sdk-release
83+
git merge v4sdk-development
84+
git push origin v4sdk-release
8585
# Create the GitHub Release
8686
- name: Create GitHub Release
8787
env:
@@ -93,15 +93,15 @@ jobs:
9393
run: |
9494
git fetch origin
9595
git push origin --delete releases/next-release
96-
# This job will check if the PR was closed, it's source branch is `releases/next-release` and target branch is `dev`.
96+
# This job will check if the PR was closed, it's source branch is `releases/next-release` and target branch is `v4sdk-development`.
9797
# This indicates that the closed PR was the `Release PR`.
9898
# This job will delete the tag created by AutoVer and the release branch.
9999
clean-up-closed-release:
100100
name: Clean up closed release
101101
if: |
102102
github.event.pull_request.merged == false &&
103103
github.event.pull_request.head.ref == 'releases/next-release' &&
104-
github.event.pull_request.base.ref == 'dev'
104+
github.event.pull_request.base.ref == 'v4sdk-development'
105105
runs-on: ubuntu-latest
106106
steps:
107107
# Checkout a full clone of the repo

0 commit comments

Comments
 (0)