From 0b382282e6534603ee2dce5172fa548781bb2400 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 23 May 2024 22:22:46 +0000
Subject: [PATCH 1/2] CI: install changelog-d from bindist (#10048)

This will avoid build problems when the GHC in the CI environment
is updated sooner than expected.
Previous breakage: https://github.com/haskell/cabal/pull/9177#issuecomment-2125549693

(cherry picked from commit d1a6ced037e69551d08d7df934ea84d74b29b04f)

# Conflicts:
#	.github/workflows/changelogs.yml
---
 .github/workflows/changelogs.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/changelogs.yml b/.github/workflows/changelogs.yml
index 64971afdf51..c5cf84570d1 100644
--- a/.github/workflows/changelogs.yml
+++ b/.github/workflows/changelogs.yml
@@ -26,6 +26,7 @@ jobs:
 
     steps:
 
+<<<<<<< HEAD
       # Cannot install changelog-d directly from remote tarball due to
       # https://github.com/haskell/cabal/issues/7360
       # Also, we would like to get the build plan for the cache key.
@@ -47,15 +48,14 @@ jobs:
           curl "https://codeberg.org/fgaz/changelog-d/archive/$changelog_d_latest.tar.gz" -o changelog-d.tar.gz
           tar -xf changelog-d.tar.gz
         working-directory: changelog-d
+=======
+      - name: Install changelog-d
+>>>>>>> d1a6ced03 (CI: install changelog-d from bindist (#10048))
         run: |
-          cabal v2-install --allow-newer=changelog-d:base
-
-      - name: Cache dependencies of changelog-d
-        uses: actions/cache/save@v4
-        if: always() && steps.cache.outputs.cache-hit != 'true'
-        with:
-          path: ~/.local/state/cabal
-          key: ${{ steps.cache.outputs.cache-primary-key }}
+          curl --create-dirs -o "$HOME/.local/bin/changelog-d" "https://codeberg.org/fgaz/changelog-d/releases/download/v1.0/changelog-d-v1.0-x86_64-linux"
+          chmod +x "$HOME/.local/bin/changelog-d"
+          # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-system-path
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Checkout cabal sources
         uses: actions/checkout@v4

From 256d7e9b7b3d740307f72a0710324ce0994d2402 Mon Sep 17 00:00:00 2001
From: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Date: Sat, 25 May 2024 21:43:32 -0400
Subject: [PATCH 2/2] !fixup resolve conflicts

---
 .github/workflows/changelogs.yml | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/.github/workflows/changelogs.yml b/.github/workflows/changelogs.yml
index c5cf84570d1..85bd169b221 100644
--- a/.github/workflows/changelogs.yml
+++ b/.github/workflows/changelogs.yml
@@ -26,31 +26,7 @@ jobs:
 
     steps:
 
-<<<<<<< HEAD
-      # Cannot install changelog-d directly from remote tarball due to
-      # https://github.com/haskell/cabal/issues/7360
-      # Also, we would like to get the build plan for the cache key.
-      - name: Fetch changelog-d
-        run: |
-          changelog_d_latest="$(curl https://codeberg.org/api/v1/repos/fgaz/changelog-d/branches/master | jq -r .commit.id)"
-          echo "Using changelog-d revision $changelog_d_latest"
-          curl "https://codeberg.org/fgaz/changelog-d/archive/$changelog_d_latest.tar.gz" -o changelog-d.tar.gz
-          tar -xf changelog-d.tar.gz
-
-      - name: Update Hackage index
-        run: cabal v2-update
-      # Cannot install it directly from remote tarball due to
-      # https://github.com/haskell/cabal/issues/7360
-      - name: Fetch changelog-d
-        run: |
-          changelog_d_latest="$(curl https://codeberg.org/api/v1/repos/fgaz/changelog-d/branches/master | jq -r .commit.id)"
-          echo "Using changelog-d revision $changelog_d_latest"
-          curl "https://codeberg.org/fgaz/changelog-d/archive/$changelog_d_latest.tar.gz" -o changelog-d.tar.gz
-          tar -xf changelog-d.tar.gz
-        working-directory: changelog-d
-=======
       - name: Install changelog-d
->>>>>>> d1a6ced03 (CI: install changelog-d from bindist (#10048))
         run: |
           curl --create-dirs -o "$HOME/.local/bin/changelog-d" "https://codeberg.org/fgaz/changelog-d/releases/download/v1.0/changelog-d-v1.0-x86_64-linux"
           chmod +x "$HOME/.local/bin/changelog-d"