diff options
| -rw-r--r-- | .github/workflows/android.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/linux.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/mac.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ohos.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/try-label.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 2 |
6 files changed, 13 insertions, 16 deletions
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f76ce42ea2b..0e4e5706b87 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -31,15 +31,15 @@ jobs: arch: ['aarch64-linux-android', 'armv7-linux-androideabi', 'i686-linux-android', 'x86_64-linux-android'] steps: - uses: actions/checkout@v4 - if: github.event_name != 'issue_comment' && github.event_name != 'pull_request_target' + if: github.event_name != 'pull_request_target' with: fetch-depth: 2 - # This is necessary to checkout the pull request if this run was triggered - # via an `issue_comment` action on a pull request. + # This is necessary to checkout the pull request if this run was triggered via a + # `pull_request_target` event. - uses: actions/checkout@v4 - if: github.event_name == 'issue_comment' || github.event_name == 'pull_request_target' + if: github.event_name == 'pull_request_target' with: - ref: refs/pull/${{ github.event.issue.number || github.event.number }}/head + ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 2 - name: Run sccache-cache uses: mozilla-actions/sccache-action@v0.0.4 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1dc56f91532..3b1e0a63167 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -81,7 +81,7 @@ jobs: - uses: actions/checkout@v4 if: github.event_name == 'pull_request_target' with: - ref: refs/pull/${{ github.event.number }}/head + ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 2 # This is necessary for `test-tidy`. - name: Run sccache-cache uses: mozilla-actions/sccache-action@v0.0.4 diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 582d2ec7f21..4daafc87564 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -76,7 +76,7 @@ jobs: - uses: actions/checkout@v4 if: github.event_name == 'pull_request_target' with: - ref: refs/pull/${{ github.event.number }}/head + ref: ${{ github.event.pull_request.head.sha }} - name: Run sccache-cache uses: mozilla-actions/sccache-action@v0.0.4 - name: Install taplo diff --git a/.github/workflows/ohos.yml b/.github/workflows/ohos.yml index ab650f106fa..1a3a2f1cca1 100644 --- a/.github/workflows/ohos.yml +++ b/.github/workflows/ohos.yml @@ -32,15 +32,15 @@ jobs: arch: ['aarch64-unknown-linux-ohos'] steps: - uses: actions/checkout@v4 - if: github.event_name != 'issue_comment' && github.event_name != 'pull_request_target' + if: github.event_name != 'pull_request_target' with: fetch-depth: 2 - # This is necessary to checkout the pull request if this run was triggered - # via an `issue_comment` action on a pull request. + # This is necessary to checkout the pull request if this run was triggered via a + # `pull_request_target` event. - uses: actions/checkout@v4 - if: github.event_name == 'issue_comment' || github.event_name == 'pull_request_target' + if: github.event_name == 'pull_request_target' with: - ref: refs/pull/${{ github.event.issue.number || github.event.number }}/head + ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 2 - name: Run sccache-cache uses: mozilla-actions/sccache-action@v0.0.4 diff --git a/.github/workflows/try-label.yml b/.github/workflows/try-label.yml index f7e8124e09a..9ffa0a6cb5f 100644 --- a/.github/workflows/try-label.yml +++ b/.github/workflows/try-label.yml @@ -82,9 +82,6 @@ jobs: python-version: '3.10' - uses: actions/checkout@v4 with: - # This is necessary to checkout the pull request if this run was triggered - # via an `label` action on a pull request. - ref: refs/pull/${{ github.event.number }}/head sparse-checkout: | python/servo/try_parser.py sparse-checkout-cone-mode: false diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9133fd30c1a..9d63b9d0901 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@v4 if: github.event_name == 'pull_request_target' with: - ref: refs/pull/${{ github.event.number }}/head + ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 2 # Workaround for https://github.com/actions/runner-images/issues/10001: - name: Upgrade llvm |