@@ -89,16 +89,16 @@ jobs:
8989
9090 - name : ' Unlock preview branch for merge'
9191 if : ${{ steps.targets.outputs.preview-branch != '' }}
92- uses : ' ./.github/actions/github/branch-protection/lock '
92+ uses : ' ./.github/actions/github/branch-protection/unlock '
9393 with :
9494 branch : ${{ steps.targets.outputs.preview-branch }}
9595 token : ${{ secrets.GH_ADMIN_TOKEN }}
96- lock-branch : ' false '
96+ fail-on-error : ' true '
9797
9898 - name : ' Backtrack: merge ${{ github.base_ref }} into ${{ steps.targets.outputs.preview-branch }}'
9999 if : ${{ steps.targets.outputs.preview-branch != '' }}
100100 env :
101- GH_TOKEN : ${{ secrets.GH_ADMIN_TOKEN }}
101+ GH_TOKEN : ${{ github.token }}
102102 run : |
103103 gh api --method POST /repos/${{ github.repository }}/merges \
104104 --field base="${{ steps.targets.outputs.preview-branch }}" \
@@ -107,16 +107,16 @@ jobs:
107107
108108 - name : ' Unlock develop branch for merge'
109109 if : ${{ steps.check-develop.outputs.exists == 'true' }}
110- uses : ' ./.github/actions/github/branch-protection/lock '
110+ uses : ' ./.github/actions/github/branch-protection/unlock '
111111 with :
112112 branch : ${{ steps.targets.outputs.develop-branch }}
113113 token : ${{ secrets.GH_ADMIN_TOKEN }}
114- lock-branch : ' false '
114+ fail-on-error : ' true '
115115
116116 - name : ' Backtrack: merge ${{ steps.targets.outputs.merge-source }} into ${{ steps.targets.outputs.develop-branch }}'
117117 if : ${{ steps.check-develop.outputs.exists == 'true' }}
118118 env :
119- GH_TOKEN : ${{ secrets.GH_ADMIN_TOKEN }}
119+ GH_TOKEN : ${{ github.token }}
120120 run : |
121121 gh api --method POST /repos/${{ github.repository }}/merges \
122122 --field base="${{ steps.targets.outputs.develop-branch }}" \
0 commit comments