Skip to content

Commit 0f87fcd

Browse files
committed
chore: attempt to create deploy PR by pointing to tag
1 parent 1eb5f50 commit 0f87fcd

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/deploy.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,18 @@ jobs:
2727
- name: Get latest tag
2828
id: get_latest_tag
2929
run: echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT
30-
- name: Checkout latest tag
31-
run: |
32-
git reset --hard ${{ steps.get_latest_tag.outputs.tag }}
33-
git merge -X theirs ${{ steps.get_latest_tag.outputs.tag }}
30+
# - name: Checkout latest tag
31+
# run: git checkout ${{ steps.get_latest_tag.outputs.tag }}
32+
# - name: Ensure staging-release branch points to latest tag
33+
# run: |
34+
# git checkout -B staging-release ${{ steps.get_latest_tag.outputs.tag }}
35+
# git push origin staging-release --force
3436
- name: Create Pull Request
3537
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
3638
with:
3739
token: ${{ secrets.SGTPOOKI_PAT }}
3840
base: staging
39-
branch: staging-release
41+
branch: ${{ steps.get_latest_tag.outputs.tag }}
4042
title: 'chore: point staging to release ${{ steps.get_latest_tag.outputs.tag }}'
4143
body: 'This PR points the staging branch to release ${{ steps.get_latest_tag.outputs.tag }}.'
4244

0 commit comments

Comments
 (0)