chore: CI: fix github.event.pull_request.merge_commit_sha sometimes not being available
This commit is contained in:
parent
c5120c1d0d
commit
6d265b42b1
1 changed files with 2 additions and 2 deletions
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
|
@ -304,7 +304,7 @@ jobs:
|
|||
# (needs to be after "Install *" to use the right shell)
|
||||
- name: CI Merge Checkout
|
||||
run: |
|
||||
git fetch origin ${{ github.event.pull_request.merge_commit_sha }}
|
||||
git fetch origin ${{ github.sha }}
|
||||
git checkout FETCH_HEAD flake.nix flake.lock
|
||||
if: github.event_name == 'pull_request'
|
||||
# (needs to be after "Checkout" so files don't get overriden)
|
||||
|
|
@ -323,7 +323,7 @@ jobs:
|
|||
uses: actions/cache@v3
|
||||
with:
|
||||
path: .ccache
|
||||
key: ${{ matrix.name }}-build-v3-${{ github.sha }}
|
||||
key: ${{ matrix.name }}-build-v3-${{ github.event.pull_request.head.sha }}
|
||||
# fall back to (latest) previous cache
|
||||
restore-keys: |
|
||||
${{ matrix.name }}-build-v3
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue