diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml index 8b6b1fa..2c84666 100644 --- a/.github/workflows/test_pr.yml +++ b/.github/workflows/test_pr.yml @@ -3,7 +3,7 @@ on: push: branches: - main - pull_request_target: + pull_request: branches: - main @@ -12,6 +12,7 @@ env: jobs: test-blackfly: + name: "Test on Windows with Blackfly" runs-on: - self-hosted - spinnaker @@ -61,6 +62,7 @@ jobs: run: ctest -C ${{env.BUILD_TYPE}} -L blackfly --output-on-failure test-oryx: + name: "Test on Windows with Oryx" runs-on: - self-hosted - spinnaker @@ -108,31 +110,3 @@ jobs: - name: Test working-directory: ${{github.workspace}}/build run: ctest -C ${{env.BUILD_TYPE}} -L oryx --output-on-failure - - merge: - name: Automerge - runs-on: "ubuntu-latest" - needs: - - test-blackfly - - test-oryx - if: ${{ github.actor == 'dependabot[bot]' }} - steps: - - name: Checkout PR - uses: actions/checkout@v2 - with: - ref: ${{ github.event.pull_request.head.sha }} - repository: ${{ github.event.pull_request.head.repo.full_name }} - - - name: Approve PR - run: gh pr review --approve "$PR_URL" - env: - PR_URL: ${{ github.event.pull_request.html_url }} - GH_TOKEN: ${{ secrets.PAT }} - - # Don't auto-merge major version updates - - name: Merge PR - if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }} - run: gh pr merge --auto --squash "$PR_URL" - env: - PR_URL: ${{ github.event.pull_request.html_url }} - GH_TOKEN: ${{ secrets.PAT }}