Skip to content

Commit e4c0ea7

Browse files
fix: deploy to release branch
1 parent 0ebc513 commit e4c0ea7

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

.github/workflows/create_release.yml

+26-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Create CLI Release
33
on:
44
pull_request:
55
branches:
6-
- main
6+
- release
77
types: [closed]
88

99
jobs:
@@ -25,3 +25,28 @@ jobs:
2525
GITHUB_TOKEN: ${{ secrets.CODECOV_RELEASE_PAT }}
2626
run: |
2727
gh release create v${{ steps.get-release-vars.outputs.release_version }} --title "Release v${{ steps.get-release-vars.outputs.release_version }}" --notes "Autogenerated for v${{ steps.get-release-vars.outputs.release_version }}. Created for ${{ github.event.pull_request.html_url }}" --generate-notes --target ${{ github.event.pull_request.head.sha }}
28+
29+
update-main:
30+
permissions:
31+
contents: write
32+
id-token: write
33+
needs: create-release
34+
name: Update main
35+
runs-on: ubuntu-latest
36+
steps:
37+
- name: Checkout
38+
uses: actions/checkout@v4
39+
40+
- name: Import GPG key
41+
id: import-gpg
42+
uses: crazy-max/ghaction-import-gpg@v6
43+
with:
44+
gpg_private_key: ${{ secrets.RELEASER_GPG_PRIVATE_KEY }}
45+
git_user_signingkey: true
46+
git_commit_gpgsign: true
47+
git_config_global: true
48+
49+
- name: Update main and push
50+
run: |
51+
git merge release
52+
git push origin main -f

.github/workflows/create_release_pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
with:
4242
github_token: ${{ secrets.GH_RELEASE_TOKEN }}
4343
head: release/${{ github.event.inputs.versionName }}
44-
base: main
44+
base: release
4545
title: Release ${{ github.event.inputs.versionName }}
4646
reviewers: ${{ github.event.issue.user.login }}
4747
body: |
4848
Release PR for ${{ github.event.inputs.versionName }}
49-
I've updated the version name and committed: ${{ steps.make-commit.outputs.commit }}.
49+
I've updated the version name and committed: ${{ steps.make-commit.outputs.commit }}.

0 commit comments

Comments
 (0)