diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2023-10-06 05:09:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-06 05:09:54 +0200 |
| commit | b3e14b9045a7805ddde2790652744b731caebaaf (patch) | |
| tree | de36c0d4518bc03a6b1e9c72628257b39b29c9ac | |
| parent | fbe363043b4099aca51f67cc6b715404e8d871dd (diff) | |
| parent | 004da0cf9140d016904a4f0087c3c5b96ecef0ab (diff) | |
| download | nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar.gz nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar.bz2 nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar.lz nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar.xz nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar.zst nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.zip | |
Merge pull request #259074 from tweag/detect-merge-conflicts
workflows/check-by-name: Better error for merge conflicts
| -rw-r--r-- | .github/workflows/check-by-name.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index c71217466cd..90ab843839f 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -17,16 +17,24 @@ jobs: # as specified in nixos/release-combined.nix runs-on: ubuntu-latest steps: + - name: Resolving the merge commit + run: | + if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge); then + mergedSha=$(cut -f1 <<< "$result") + echo "The PR appears to not have any conflicts, checking the merge commit $mergedSha" + else + echo "The PR may have a merge conflict" + exit 1 + fi + echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" - uses: actions/checkout@v4 with: # pull_request_target checks out the base branch by default - ref: refs/pull/${{ github.event.pull_request.number }}/merge + ref: ${{ env.mergedSha }} # Fetches the merge commit and its parents fetch-depth: 2 - name: Determining PR git hashes run: | - echo "mergedSha=$(git rev-parse HEAD)" >> "$GITHUB_ENV" - # For pull_request_target this is the same as $GITHUB_SHA echo "baseSha=$(git rev-parse HEAD^1)" >> "$GITHUB_ENV" |