From cf66f895a1ae15f6150cd0f2770d7df5d520123d Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 23 May 2024 13:59:38 +0200 Subject: [PATCH] [ci] move back to pull_request trigger pull_request_target does not allow approval and runs unconditionally. --- .github/workflows/abi-checker.yml | 6 +++--- .github/workflows/clang-tidy.yml | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/abi-checker.yml b/.github/workflows/abi-checker.yml index d98aa2d1c..6b78aadd1 100644 --- a/.github/workflows/abi-checker.yml +++ b/.github/workflows/abi-checker.yml @@ -7,7 +7,7 @@ on: description: 'Base revision for ABI compatibility check' required: true default: '3.0.0' - pull_request_target: + pull_request: branches: [ master, stable* ] schedule: - cron: '30 4 * * SUN' @@ -18,7 +18,7 @@ jobs: name: "Run ABI checker on ubuntu-latest" steps: - name: "Check out pull request" - if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event_name == 'pull_request_target' }} + if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event_name == 'pull_request' }} uses: suzuki-shunsuke/get-pr-action@v0.1.0 id: pr @@ -95,7 +95,7 @@ jobs: - name: "Run ABI check..." env: - BASE_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event_name == 'pull_request_target' && github.event.pull_request.base.sha || github.event_name == 'workflow_dispatch' && inputs.API_BASE_REF || '3.0.0' }} + BASE_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event_name == 'workflow_dispatch' && inputs.API_BASE_REF || '3.0.0' }} run: | echo "BASE_REF=$BASE_REF" ./checker/check-abi -s checker/abi-suppr.txt --parameters="-Cchecker/config-abi.txt" $BASE_REF $(git rev-parse HEAD) diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 4c2c09d0f..c791aa9f4 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -1,6 +1,6 @@ name: clang-tidy-review on: - pull_request_target: + pull_request: branches: [ master, stable* ] jobs: @@ -8,12 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: suzuki-shunsuke/get-pr-action@v0.1.0 - id: pr - uses: actions/checkout@v4 - with: - ref: ${{steps.pr.outputs.merge_commit_sha}} - # Run clang-tidy - uses: ZedThree/clang-tidy-review@v0.17.1 id: review