feat: add commit hash to report

Author: Defelo

.github/workflows/review.yml

@@ -69,7 +69,36 @@ on:
         default: false
 
 jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      pr: ${{ steps.pr.outputs.pr }}
+      head: ${{ steps.pr.outputs.head }}
+      merge: ${{ steps.pr.outputs.merge }}
+
+    steps:
+      - name: get pr
+        id: pr
+        run: |
+          while true; do
+            pr="$(gh api "/repos/NixOS/nixpkgs/pulls/$PR_NUMBER")"
+            jq -e '.mergeable_state == "unknown" and (.merged | not)' <<< "$pr" > /dev/null || break
+            echo "mergeable state not known yet, retrying..."
+            sleep 2
+          done
+          jq <<< "$pr"
+          if [[ "$(jq '.merged or .mergeable' <<< "$pr")" != "true" ]]; then
+            echo "::error::PR is not mergeable"
+            exit 1
+          fi
+          echo "pr=$pr" >> "$GITHUB_OUTPUT"
+          echo "head=$(jq -r '.head.sha' <<< "$pr")" >> "$GITHUB_OUTPUT"
+          echo "merge=$(jq -r '.merge_commit_sha' <<< "$pr")" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ github.token }}
+
   review:
+    needs: [prepare]
     strategy:
       fail-fast: false
       matrix:
@@ -101,7 +130,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          sparse-checkout: .github/actions
+          sparse-checkout: |
+            .github/actions
+            packages.nix
 
       - name: setup nix
         uses: ./.github/actions/setup-nix
@@ -122,9 +153,7 @@ jobs:
           elif [[ ${{ inputs.push-to-cache && vars.CACHIX_CACHE != '' }} = true ]]; then
             pkgs+=(cachix)
           fi
-          args=()
-          for pkg in ${pkgs[@]}; do args+=("github:nixos/nixpkgs/nixpkgs-unstable#$pkg"); done
-          nix profile install ${args[@]}
+          nix profile install -f packages.nix ${pkgs[@]}
 
       - name: clone nixpkgs
         uses: actions/checkout@v4
@@ -141,12 +170,14 @@ jobs:
             --no-headers \
             --print-result \
             --build-args="-L" \
+            --pr-json="$PR_JSON" \
             $EXTRA_ARGS \
             || true
         working-directory: nixpkgs
         env:
           GITHUB_TOKEN: ${{ github.token }}
           EXTRA_ARGS: ${{ inputs.extra-args }}
+          PR_JSON: ${{ needs.prepare.outputs.pr }}
 
       - name: push results to cache
         if: ${{ inputs.push-to-cache && ((vars.ATTIC_SERVER != '' && vars.ATTIC_CACHE != '') || vars.CACHIX_CACHE != '') }}
@@ -227,7 +258,7 @@ jobs:
 
   report:
     runs-on: ubuntu-latest
-    needs: [review]
+    needs: [prepare, review]
     outputs:
       report: ${{ steps.report.outputs.report }}
       success: ${{ steps.report.outputs.success }}
@@ -238,7 +269,9 @@ jobs:
         run: |
           echo -e "## \`nixpkgs-review\` result\n" >> report.md
           echo -e "Generated using [\`nixpkgs-review-gha\`](https://github.com/Defelo/nixpkgs-review-gha)\n" >> report.md
-          echo -e "Command: \`nixpkgs-review pr ${PR_NUMBER}${EXTRA_ARGS:+ $EXTRA_ARGS}\`\n" >> report.md
+          echo -e "Command: \`nixpkgs-review pr ${PR_NUMBER}${EXTRA_ARGS:+ $EXTRA_ARGS}\`" >> report.md
+          echo -e "Commit: [\`$HEAD\`](https://github.com/NixOS/nixpkgs/commit/$HEAD) ([subsequent changes](https://github.com/NixOS/nixpkgs/compare/$HEAD..pull/$PR_NUMBER/head))" >> report.md
+          echo -e "Merge: [\`$MERGE\`](https://github.com/NixOS/nixpkgs/commit/$MERGE)\n" >> report.md
           echo -e "Logs: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}\n" >> report.md
 
           mkdir .tmp
@@ -276,6 +309,8 @@ jobs:
           echo success=$(jq -s 'all(.[].result[]; .failed==[])' reports/*.json) >> "$GITHUB_OUTPUT"
           sed '1s|$| for [#'"$PR_NUMBER"'](https://github.com/NixOS/nixpkgs/pull/'"$PR_NUMBER"')|' report.md >> $GITHUB_STEP_SUMMARY
         env:
+          HEAD: ${{ needs.prepare.outputs.head }}
+          MERGE: ${{ needs.prepare.outputs.merge }}
           EXTRA_ARGS: ${{ inputs.extra-args }}
           FETCH_CMD_X86_64_LINUX: ${{ needs.review.outputs.fetch_cmd_x86_64-linux }}
           FETCH_CMD_AARCH64_LINUX: ${{ needs.review.outputs.fetch_cmd_aarch64-linux }}

packages.nix

@@ -0,0 +1,8 @@
+let
+  nixpkgs = builtins.getFlake "github:nixos/nixpkgs/nixpkgs-unstable";
+  nixpkgs-review = builtins.getFlake "github:Mic92/nixpkgs-review/eda950b6dc10ae0aeaaaae6b98a55f0040de530e";
+in
+
+import nixpkgs {
+  overlays = [ (final: prev: { inherit (nixpkgs-review.packages.${final.system}) nixpkgs-review; }) ];
+}