From 65f045abfd4cff7aebe3b3cdda131c0b105739fb Mon Sep 17 00:00:00 2001
From: Leona Maroni <lm@flyingcircus.io>
Date: Wed, 18 Dec 2024 15:16:47 +0100
Subject: [PATCH] update-nixpkgs: update for the new fc-release-tools versions

This version sends matrix notifications on graceful failures and hard-resets
nixpkgs with a safety belt instead of rebasing. This fixes the problems
when a manual rebase conflict resolution is required.

PL-133100
---
 .github/workflows/update-nixpkgs-cleanup.yaml |  9 ++++++++-
 ...xpkgs-updates-hookshot-hard-reset_scriv.md | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/20241218_151938_PL-133100-nixpkgs-updates-hookshot-hard-reset_scriv.md

diff --git a/.github/workflows/update-nixpkgs-cleanup.yaml b/.github/workflows/update-nixpkgs-cleanup.yaml
index b0bf4ca3a..e2fcd0e7e 100644
--- a/.github/workflows/update-nixpkgs-cleanup.yaml
+++ b/.github/workflows/update-nixpkgs-cleanup.yaml
@@ -1,7 +1,7 @@
 name: update-nixpkgs-cleanup
 
 on:
-  pull_request:
+  pull_request_target:
     types:
       - closed
 
@@ -10,6 +10,11 @@ jobs:
     if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'nixpkgs-auto-update/')
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          path: 'fc-nixos'
+          fetch-depth: 0
       - uses: actions/checkout@v4
         with:
           repository: flyingcircusio/fc-nixos-release-tools
@@ -40,7 +45,9 @@ jobs:
       - run: |
           ./result/bin/update-nixpkgs cleanup \
             --merged-pr-id ${{ github.event.number }} \
+            --fc-nixos-dir fc-nixos \
             --nixpkgs-dir nixpkgs \
             --nixpkgs-origin-url https://x-access-token:${{steps.app-token.outputs.token}}@github.com/flyingcircusio/nixpkgs.git
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          MATRIX_HOOKSHOT_URL: ${{ secrets.MATRIX_HOOKSHOT_URL }}
diff --git a/changelog.d/20241218_151938_PL-133100-nixpkgs-updates-hookshot-hard-reset_scriv.md b/changelog.d/20241218_151938_PL-133100-nixpkgs-updates-hookshot-hard-reset_scriv.md
new file mode 100644
index 000000000..b37a40aa5
--- /dev/null
+++ b/changelog.d/20241218_151938_PL-133100-nixpkgs-updates-hookshot-hard-reset_scriv.md
@@ -0,0 +1,19 @@
+<!--
+
+A new changelog entry.
+
+Delete placeholder items that do not apply. Empty sections will be removed
+automatically during release.
+
+Leave the XX.XX as is: this is a placeholder and will be automatically filled
+correctly during the release and helps when backporting over multiple platform
+branches.
+
+-->
+
+### Impact
+
+
+### NixOS XX.XX platform
+
+- Internal: Prepare update-nixpkgs for new fc-release-tools versions