various necessary and aestetic changes to the release github actions;…

… note the dir name change in the dockerfile
poseidon-framework · Oct 27, 2023 · 0b0748e · 0b0748e
1 parent 6a5ea14
commit 0b0748e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git 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
@@ -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: |