diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 4659e451f26..eb2a312955f 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -12,6 +12,7 @@ on: jobs: check: if: | + github.event.pull_request.user.login != 'dependabot[bot]' && !contains(github.event.pull_request.head.ref, 'changeset-release') && !contains(github.event.pull_request.labels.*.name, '🤖Skip Changelog') runs-on: ubuntu-latest diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index e252324ee8d..a50228ea644 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -8,11 +8,11 @@ permissions: jobs: dependabot: runs-on: shopify-ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} + if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }} steps: - name: Dependabot metadata id: dependabot-metadata - uses: dependabot/fetch-metadata@v1.3.6 + uses: dependabot/fetch-metadata@v2 with: github-token: '${{ secrets.GITHUB_TOKEN }}'