File tree Expand file tree Collapse file tree 1 file changed +7
-5
lines changed Expand file tree Collapse file tree 1 file changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -27,16 +27,18 @@ jobs:
27
27
- name : Get latest tag
28
28
id : get_latest_tag
29
29
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
34
36
- name : Create Pull Request
35
37
uses : peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
36
38
with :
37
39
token : ${{ secrets.SGTPOOKI_PAT }}
38
40
base : staging
39
- branch : staging-release
41
+ branch : ${{ steps.get_latest_tag.outputs.tag }}
40
42
title : ' chore: point staging to release ${{ steps.get_latest_tag.outputs.tag }}'
41
43
body : ' This PR points the staging branch to release ${{ steps.get_latest_tag.outputs.tag }}.'
42
44
You can’t perform that action at this time.
0 commit comments