diff options
| -rw-r--r-- | .github/workflows/autobot.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/staging-automerge.yaml | 20 | ||||
| -rw-r--r-- | .github/workflows/update-lock.yaml | 2 |
3 files changed, 9 insertions, 15 deletions
diff --git a/.github/workflows/autobot.yaml b/.github/workflows/autobot.yaml index cc1756c..efb14a9 100644 --- a/.github/workflows/autobot.yaml +++ b/.github/workflows/autobot.yaml @@ -22,4 +22,4 @@ jobs: run: gh pr merge --auto --rebase "$PR" env: PR: ${{ github.event.pull_request.html_url }} - GITHUB_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/staging-automerge.yaml b/.github/workflows/staging-automerge.yaml index 4cbdfaa..c49f590 100644 --- a/.github/workflows/staging-automerge.yaml +++ b/.github/workflows/staging-automerge.yaml @@ -17,8 +17,6 @@ jobs: - name: check if pr exists id: check run: | - { - echo 'skip<<EOF' prs=$(gh pr list \ --repo ${{ github.repository }} \ --head staging \ @@ -26,23 +24,19 @@ jobs: --jq 'map(select(.state == "OPEN")) | length') if (( prs > 0 )); then - echo true - else - echo false + echo "skip=true" >> "$GITHUB_OUTPUT" fi - echo EOF - } >> "$GITHUB_OUTPUT" env: - GITHUB_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ github.token }} - uses: actions/checkout@v4 - if: "!steps.check.outputs.skip" + if: ${{ !steps.check.outputs.skip }} with: fetch-depth: 0 - name: create pr - if: "!steps.check.outputs.skip" + if: ${{ !steps.check.outputs.skip }} run: | gh pr create \ --base main \ @@ -50,10 +44,10 @@ jobs: --title "auto-merge: ${{ github.ref_name }} -> main" \ --fill env: - GITHUB_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ github.token }} - name: enable auto-merge - if: "!steps.check.outputs.skip" + if: ${{ !steps.check.outputs.skip }} run: gh pr merge --auto --rebase --match-head-commit ${{ github.sha }} env: - GITHUB_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/update-lock.yaml b/.github/workflows/update-lock.yaml index 9e3301d..b922394 100644 --- a/.github/workflows/update-lock.yaml +++ b/.github/workflows/update-lock.yaml @@ -30,5 +30,5 @@ jobs: shell: bash run: gh pr merge --auto --rebase "$PR_ID" env: - GITHUB_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ github.token }} PR_ID: ${{ steps.update.outputs.pull-request-number }} |