From 0b0748e8fd452f7d401287acf8668da5c9551fb5 Mon Sep 17 00:00:00 2001
From: Clemens Schmid <clemens@nevrome.de>
Date: Fri, 27 Oct 2023 16:40:24 +0200
Subject: [PATCH] various necessary and aestetic changes to the release github
 actions; note the dir name change in the dockerfile

---
 .github/workflows/Dockerfile.centos |  2 +-
 .github/workflows/release.yml       | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/Dockerfile.centos b/.github/workflows/Dockerfile.centos
index 5f185b9a..6ad731d4 100644
--- a/.github/workflows/Dockerfile.centos
+++ b/.github/workflows/Dockerfile.centos
@@ -6,7 +6,7 @@ RUN yum -y install zlib-devel wget ncurses-devel ncurses-compat-libs make gcc
 # Install GHC since stack's local install has issues
 RUN wget https://downloads.haskell.org/~ghc/9.4.7/ghc-9.4.7-x86_64-centos7-linux.tar.xz
 RUN tar xvf ghc-9.4.7-x86_64-centos7-linux.tar.xz
-RUN cd ghc-9.4.7; ./configure; make install
+RUN cd ghc-9.4.7-x86_64-unknown-linux; ./configure; make install
 
 # install stack
 RUN curl -sSL https://get.haskellstack.org/ | sh
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b971b524..835b7565 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,8 +29,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        cabal: ["3.6"]
+        os: [ubuntu-20.04] # old version is on purpose: to compile with old libc
         ghc: ["9.4.7"]
 
     steps:
@@ -45,11 +44,10 @@ jobs:
           tagRegexGroup: 1
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         id: setup-haskell-cabal
         with:
           ghc-version: ${{ matrix.ghc }}
-          cabal-version: ${{ matrix.cabal }}
 
       - name: Freeze
         run: cabal freeze
@@ -90,7 +88,6 @@ jobs:
     strategy:
       matrix:
         os: [macOS-latest]
-        cabal: ["3.6"]
         ghc: ["9.4.7"]
 
     steps:
@@ -108,11 +105,10 @@ jobs:
         run: brew install pkg-config
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         id: setup-haskell-cabal
         with:
           ghc-version: ${{ matrix.ghc }}
-          cabal-version: ${{ matrix.cabal }}
 
       - name: Freeze
         run: |
@@ -155,7 +151,6 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        cabal: ["3.6"]
         ghc: ["9.4.7"]
 
     steps:
@@ -170,11 +165,10 @@ jobs:
           tagRegexGroup: 1
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         id: setup-haskell-cabal
         with:
           ghc-version: ${{ matrix.ghc }}
-          cabal-version: ${{ matrix.cabal }}
 
       - name: Freeze
         run: |