From 2b10a81a0b4a1b02b65aa554a411ab2c69b81e56 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Thu, 29 Sep 2022 13:10:49 -0700 Subject: [PATCH 1/2] Fix GitHub Actions workflow config --- .github/workflows/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 83b450b..adf869c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,9 @@ name: Main on: -- push -- pull_request_target + push: + branches: + - main + pull_request: {} jobs: ci: strategy: @@ -16,7 +18,7 @@ jobs: env: CI: true steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: bundler-cache: true From 777ce44a310363d1466ee032b753927091718334 Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Thu, 29 Sep 2022 13:13:39 -0700 Subject: [PATCH 2/2] Update automerge trigger --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index adf869c..1557545 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: name: AutoMerge needs: ci runs-on: ubuntu-latest - if: github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]' + if: github.event_name == 'pull_request' && github.actor == 'dependabot[bot]' steps: - uses: actions/github-script@v3 with: