diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index c91ac7d4..0ba55681 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -51,7 +51,7 @@ jobs: BASE_BRANCHES: nightly GITHUB_TOKEN: ${{ secrets.GH_BOT_TOKEN }} GITHUB_LOGIN: ${{ secrets.GH_BOT_NAME }} - MERGE_LABELS: "" + MERGE_LABELS: "!dependencies" MERGE_METHOD: "squash" MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})" MERGE_DELETE_BRANCH: true diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml index 4522182f..83afbc3a 100644 --- a/.github/workflows/autoupdate.yml +++ b/.github/workflows/autoupdate.yml @@ -36,11 +36,17 @@ jobs: dependabot-rebase: name: Dependabot Rebase if: >- - startsWith(github.repository, 'LizardByte/') && - contains(github.event.pull_request.labels.*.name, 'central_dependency') == false + startsWith(github.repository, 'LizardByte/') runs-on: ubuntu-latest steps: + - name: check labels + id: label + run: | + echo "central_dep=${{ contains(github.event.pull_request.labels.*.name, 'central_dependency') }}" \ + >> $GITHUB_OUTPUT + - name: rebase + if: ${{ steps.label.outputs.central_dep == false }} uses: "bbeesley/gha-auto-dependabot-rebase@v1.2.0" env: GITHUB_TOKEN: ${{ secrets.GH_BOT_TOKEN }}