diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68c8415fed7..52d21ef3ab5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,8 +133,12 @@ jobs: BASE_ROOT_DIR: ${{ github.workspace }} steps: - - name: Checkout + - &CHECKOUT + name: Checkout uses: actions/checkout@v5 + with: + # Ensure the latest merged pull request state is used, even on re-runs. + ref: &CHECKOUT_REF_TMPL ${{ github.event_name == 'pull_request' && github.ref || '' }} - name: Clang version run: | @@ -205,8 +209,7 @@ jobs: job-name: 'Windows native, fuzz, VS 2022' steps: - - name: Checkout - uses: actions/checkout@v5 + - *CHECKOUT - name: Configure Developer Command Prompt for Microsoft Visual C++ # Using microsoft/setup-msbuild is not enough. @@ -317,8 +320,7 @@ jobs: DANGER_CI_ON_HOST_FOLDERS: 1 steps: - - name: Checkout - uses: actions/checkout@v5 + - *CHECKOUT - name: Configure environment uses: ./.github/actions/configure-environment @@ -358,8 +360,7 @@ jobs: TEST_RUNNER_TIMEOUT_FACTOR: 40 steps: - - name: Checkout - uses: actions/checkout@v5 + - *CHECKOUT - name: Download built executables uses: actions/download-artifact@v4 @@ -500,8 +501,7 @@ jobs: file-env: './ci/test/00_setup_env_native_msan.sh' steps: - - name: Checkout - uses: actions/checkout@v5 + - *CHECKOUT - name: Configure environment uses: ./.github/actions/configure-environment @@ -544,6 +544,7 @@ jobs: - name: Checkout uses: actions/checkout@v5 with: + ref: *CHECKOUT_REF_TMPL fetch-depth: 0 - name: Configure Docker