Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/release-branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ jobs:

permissions:
contents: write
pull-requests: write

needs: [tag, compute-version, localazy]
steps:
Expand All @@ -102,3 +103,14 @@ jobs:
sha,
});
console.log(`Created branch ${branch} from ${sha}`);

- name: Open a pull request to merge the branch into main
env:
VERSION: ${{ needs.compute-version.outputs.short }}
run: |
gh pr create \
--title "Release branch $VERSION" \
--body "This pull request was automatically created by the release workflow. It merges the release branch back to main." \
--base main \
--head "release/v$VERSION" \
--label "T-Task"
27 changes: 24 additions & 3 deletions .github/workflows/release-bump.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,38 @@ jobs:
secrets:
BOT_GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}

merge-back:
name: Open a pull request to merge the release branch back to main
update-branch:
name: Update the release branch
runs-on: ubuntu-22.04

permissions:
pull-requests: write

needs: [tag, compute-version]
if: github.event.inputs.merge-back
steps:
- name: Update the release branch
uses: actions/[email protected]
env:
BRANCH: "${{ github.ref_name }}"
SHA: ${{ needs.tag.outputs.sha }}
with:
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
script: |
const [owner, repo] = process.env.GITHUB_REPOSITORY.split('/');
const branch = process.env.BRANCH;
const sha = process.env.SHA;
const ref = `refs/heads/${branch}`;

await github.rest.git.updateRef({
owner,
repo,
ref,
sha,
});
console.log(`Updated branch ${branch} to ${sha}`);

- name: Open a pull request to merge the release branch back to main
if: github.event.inputs.merge-back
env:
VERSION: ${{ needs.compute-version.outputs.version }}
run: |
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ jobs:
working-directory: tools/syn2mas
run: npm version "${{ inputs.version }}" --no-git-tag-version

- name: Re-format package.json with biome
working-directory: tools/syn2mas
run: npx biome format --write package.json

- name: Commit and tag using the GitHub API
uses: actions/[email protected]
id: commit
Expand Down Expand Up @@ -142,11 +138,3 @@ jobs:
sha: tagSha,
});
console.log("Created tag ref:", tag.data.url);

const ref = await github.rest.git.updateRef({
owner,
repo,
ref: `heads/${branch}`,
sha: commit,
});
console.log("Updated branch ref:", ref.data.url);
2 changes: 2 additions & 0 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
"translations/**",
"policies/**",
"crates/**",
"frontend/package.json",
"frontend/src/gql/**",
"frontend/src/routeTree.gen.ts",
"frontend/.storybook/locales.ts",
"frontend/.storybook/public/mockServiceWorker.js",
"frontend/locales/*.json",
"tools/syn2mas/package.json",
"**/coverage/**",
"**/dist/**"
]
Expand Down
Loading