diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-08-05 08:32:06 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-08-05 09:18:56 +0200 |
| commit | b712935571355df44e126c5b27c98ccd53d1d18b (patch) | |
| tree | 8d5e23736a01dd3c852c5578a82c52f123f027f8 /.github/workflows/ci.yml | |
| parent | 09121a7396578abef95aec720b7cee24debf9b0d (diff) | |
tools/check-commits.sh: fix commit range detection
We currently check from github.event.pull_request.base.sha
to github.event.pull_request.head.sha, but they may be in
different branches if the PR commits are branched not from
the latest master HEAD (at the time of PR creation).
Then GH will create a merge commit, and the range we try
to check is not valid.
Check github.event.pull_request.commits commits backwards
from github.event.pull_request.head.sha commit.
Diffstat (limited to '.github/workflows/ci.yml')
| -rw-r--r-- | .github/workflows/ci.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b4119e33..aab76bb79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,6 @@ jobs: with: path: gopath/src/github.com/google/syzkaller # This is needed for tools/check-commits.sh - ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 100 # Caches everything in .cache dir, in partiuclar we want to cache go-build and golangci-lint stuff. # For reference see: @@ -29,7 +28,9 @@ jobs: # Run make presubmit_smoke. - name: run env: + GITHUB_PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} GITHUB_PR_BASE_SHA: ${{ github.event.pull_request.base.sha }} + GITHUB_PR_COMMITS: ${{ github.event.pull_request.commits }} run: gopath/src/github.com/google/syzkaller/.github/workflows/run.sh syz-env make presubmit_smoke # Upload coverage report to codecov.io. For reference see: # https://github.com/codecov/codecov-action/blob/master/README.md |