diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 210235c..02994cc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -27,16 +27,18 @@ jobs: - name: Get latest tag id: get_latest_tag run: echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT - - name: Checkout latest tag - run: | - git reset --hard ${{ steps.get_latest_tag.outputs.tag }} - git merge -X theirs ${{ steps.get_latest_tag.outputs.tag }} + # - name: Checkout latest tag + # run: git checkout ${{ steps.get_latest_tag.outputs.tag }} + # - name: Ensure staging-release branch points to latest tag + # run: | + # git checkout -B staging-release ${{ steps.get_latest_tag.outputs.tag }} + # git push origin staging-release --force - name: Create Pull Request uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5 with: token: ${{ secrets.SGTPOOKI_PAT }} base: staging - branch: staging-release + branch: ${{ steps.get_latest_tag.outputs.tag }} title: 'chore: point staging to release ${{ steps.get_latest_tag.outputs.tag }}' body: 'This PR points the staging branch to release ${{ steps.get_latest_tag.outputs.tag }}.'