From 020dd9e6520ce88ed6a75f3b9a631820a1757729 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Thu, 21 Nov 2024 20:01:18 +0100
Subject: [PATCH] workflows/eval: Minor fixes, ensure the correct commit is
 checked out

- `env.mergedSha` is empty, so it checked out the master version by
default
- The process step used `needs.attrs.outputs.mergedSha`, but apparently
  that's empty unless `attrs` is declared as a `needs`, even though
  `outputs` implicitly depends on `attrs`

(cherry picked from commit 19db54eda1057089c1c64c2a06758c41a4ff67b1)
---
 .github/workflows/eval.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 1686898e6842..280ed141576c 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -38,7 +38,7 @@ jobs:
         # Add this to _all_ subsequent steps to skip them
         if: steps.merged.outputs.mergedSha
         with:
-          ref: ${{ env.mergedSha }}
+          ref: ${{ steps.merged.outputs.mergedSha }}
           path: nixpkgs
 
       - name: Install Nix
@@ -104,7 +104,7 @@ jobs:
   process:
     name: Process
     runs-on: ubuntu-latest
-    needs: outpaths
+    needs: [ outpaths, attrs ]
     steps:
       - name: Download output paths and eval stats for all systems
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8