Skip to content

Commit

Permalink
chore: update config files to support GitHub CI for V4
Browse files Browse the repository at this point in the history
  • Loading branch information
philasmar committed Oct 17, 2024
1 parent 0ff51b2 commit 274913d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/aws-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/create-release-pr.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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"
26 changes: 13 additions & 13 deletions .github/workflows/sync-main-dev.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -75,13 +75,13 @@ jobs:
run: |
changelog=$(autover changelog --output-to-console)
echo "CHANGELOG<<EOF"$'\n'"$changelog"$'\n'EOF >> "$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:
Expand All @@ -93,15 +93,15 @@ 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:
name: Clean up closed release
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
Expand Down

0 comments on commit 274913d

Please sign in to comment.