From abe18fb144f707b57ee56dda996ca034c47a3bd6 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sun, 20 Apr 2025 16:54:44 -0400
Subject: [PATCH] ci(nix): checkout merge commit of pull request

Signed-off-by: Seth Flynn <getchoo@tuta.io>
---
 .github/workflows/nix.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index fea0df6ce..816e2a7aa 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -61,8 +61,17 @@ jobs:
       id-token: write
 
     steps:
+      - name: Get merge commit
+        if: ${{ github.event_name == 'pull_request_target' }}
+        id: merge-commit
+        uses: ./.github/actions/get-merge-commit.yml
+        with:
+          pull-request-id: ${{ github.event.pull_request.id }}
+    
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.merge-commit.outputs.merge-commit-sha || github.sha }}
 
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@v16