Skip to content

Commit 37e9dfd

Browse files
committed
Update workflows to reflect the v4sdk branches
1 parent 3189049 commit 37e9dfd

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
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-
- main
8-
- dev
7+
- v4sdk-release
8+
- v4sdk-development
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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This GitHub Workflow is designed to run automatically after the Release PR, which was created by the `Create Release PR` workflow, is closed.
33
# This workflow has 2 jobs. One will run if the `Release PR` is successfully merged, indicating that a release should go out.
44
# The other will run if the `Release PR` was closed and a release is not intended to go out.
5-
name: Sync 'dev' and 'main'
5+
name: Sync 'v4sdk-development' and 'v4sdk-release'
66

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

1616
jobs:
17-
# This job will check if the PR was successfully merged, it's source branch is `releases/next-release` and target branch is `dev`.
17+
# This job will check if the PR was successfully merged, it's source branch is `releases/next-release` and target branch is `v4sdk-development`.
1818
# This indicates that the merged PR was the `Release PR`.
19-
# This job will synchronize `dev` and `main`, create a GitHub Release and delete the `releases/next-release` branch.
20-
sync-dev-and-main:
21-
name: Sync dev and main
19+
# This job will synchronize `v4sdk-development` and `v4sdk-release`, create a GitHub Release and delete the `releases/next-release` branch.
20+
sync-v4sdk-development-and-v4sdk-release:
21+
name: Sync v4sdk-development and v4sdk-release
2222
if: |
2323
github.event.pull_request.merged == true &&
2424
github.event.pull_request.head.ref == 'releases/next-release' &&
25-
github.event.pull_request.base.ref == 'dev'
25+
github.event.pull_request.base.ref == 'v4sdk-development'
2626
runs-on: ubuntu-latest
2727
steps:
2828
# Assume an AWS Role that provides access to the Access Token
@@ -42,7 +42,7 @@ jobs:
4242
- name: Checkout code
4343
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
4444
with:
45-
ref: dev
45+
ref: v4sdk-development
4646
fetch-depth: 0
4747
token: ${{ env.AWS_SECRET_TOKEN }}
4848
# Install .NET8 which is needed for AutoVer
@@ -76,13 +76,13 @@ jobs:
7676
run: |
7777
changelog=$(autover changelog --output-to-console)
7878
echo "CHANGELOG<<EOF"$'\n'"$changelog"$'\n'EOF >> "$GITHUB_OUTPUT"
79-
# Merge dev into main in order to synchronize the 2 branches
80-
- name: Merge dev to main
79+
# Merge v4sdk-development into v4sdk-release in order to synchronize the 2 branches
80+
- name: Merge v4sdk-development to v4sdk-release
8181
run: |
8282
git fetch origin
83-
git checkout main
84-
git merge dev
85-
git push origin main
83+
git checkout v4sdk-release
84+
git merge v4sdk-development
85+
git push origin v4sdk-release
8686
# Create the GitHub Release
8787
- name: Create GitHub Release
8888
env:
@@ -94,15 +94,15 @@ jobs:
9494
run: |
9595
git fetch origin
9696
git push origin --delete releases/next-release
97-
# This job will check if the PR was closed, it's source branch is `releases/next-release` and target branch is `dev`.
97+
# This job will check if the PR was closed, it's source branch is `releases/next-release` and target branch is `v4sdk-development`.
9898
# This indicates that the closed PR was the `Release PR`.
9999
# This job will delete the tag created by AutoVer and the release branch.
100100
clean-up-closed-release:
101101
name: Clean up closed release
102102
if: |
103103
github.event.pull_request.merged == false &&
104104
github.event.pull_request.head.ref == 'releases/next-release' &&
105-
github.event.pull_request.base.ref == 'dev'
105+
github.event.pull_request.base.ref == 'v4sdk-development'
106106
runs-on: ubuntu-latest
107107
steps:
108108
# Checkout a full clone of the repo

0 commit comments

Comments
 (0)