Skip to content

Commit d3bc14d

Browse files
committed
Raise the release PR to point to a branch
1 parent 90137a0 commit d3bc14d

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

.github/workflows/auto-release.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,23 @@ jobs:
6464
git config --global user.name "$ACTOR"
6565
git config --global user.email "$ACTOR"@users.noreply.github.com
6666
67-
- name: Create release preparation branch
67+
- name: Create version branch
6868
env:
6969
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
7070
COMMIT_ID: ${{ github.event.inputs.commit_id }}
7171
working-directory: ./local_kernel
7272
run: |
73-
git checkout -b "release-prep-$VERSION_NUMBER" "$COMMIT_ID"
73+
git checkout -b "$VERSION_NUMBER" "$COMMIT_ID"
74+
git push -u origin "$VERSION_NUMBER"
7475
echo "COMMIT_SHA_1=$(git rev-parse HEAD)" >> $GITHUB_ENV
7576
77+
- name: Create release preparation branch
78+
env:
79+
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
80+
working-directory: ./local_kernel
81+
run: |
82+
git checkout -b "release-prep-$VERSION_NUMBER"
83+
7684
- name: Update source files with version info
7785
env:
7886
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
@@ -118,7 +126,7 @@ jobs:
118126
working-directory: ./local_kernel
119127
run: |
120128
PR_URL=$(gh pr create \
121-
--base main \
129+
--base "$VERSION_NUMBER" \
122130
--head "release-prep-$VERSION_NUMBER" \
123131
--title "[AUTO][RELEASE]: Release $VERSION_NUMBER" \
124132
--body "Automated release preparation for $VERSION_NUMBER. Updates version numbers in source files and manifest.yml.")
@@ -147,7 +155,7 @@ jobs:
147155
uses: actions/checkout@v4.1.1
148156
with:
149157
path: local_kernel
150-
ref: main
158+
ref: ${{ github.event.inputs.version_number }}
151159
fetch-depth: 0
152160

153161
- name: Generate SBOM
@@ -161,10 +169,9 @@ jobs:
161169
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
162170
working-directory: ./local_kernel
163171
run: |
164-
git checkout -b "release-$VERSION_NUMBER"
165172
git add .
166173
git commit -m '[AUTO][RELEASE]: Update SBOM'
167-
git push -u origin "release-$VERSION_NUMBER"
174+
git push -u origin "$VERSION_NUMBER"
168175
echo "COMMIT_SHA_2=$(git rev-parse HEAD)" >> $GITHUB_ENV
169176
170177
- name: Release
@@ -202,4 +209,3 @@ jobs:
202209
else
203210
echo "Skipping release-prep branch deletion — PR is still open (state: $PR_STATE)"
204211
fi
205-
git push origin --delete "release-$VERSION_NUMBER" || true

0 commit comments

Comments
 (0)