From cd28e6fb901771f91a95d4567c2505212bc29a91 Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Wed, 6 Mar 2024 13:40:36 +0100
Subject: [PATCH] Switch to the haskell image

---
 .gitea/workflows/build.yml | 21 +++++++--------------
 lib/SlackBuilder/Info.hs   |  4 ++--
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index a5b73e0..d0b5eb6 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -18,26 +18,19 @@ jobs:
       - name: Install dependencies
         run: |
           cabal update
-          cabal install hlint "--constraint=hlint ==3.6.1"
+          cabal install hlint "--constraint=hlint ==3.8"
       - run: cabal exec hlint -- src lib tests
 
   test:
-    runs-on: alpine
+    runs-on: haskell
     steps:
       - name: Set up environment
-        shell: ash {0}
         run: |
-          apk add --no-cache git bash curl build-base readline-dev openssl-dev zlib-dev libpq-dev gmp-dev
-      - name: Prepare system
-        run: |
-          curl --create-dirs --output-dir \
-            ~/.ghcup/bin https://downloads.haskell.org/~ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 -o ghcup
-          chmod +x ~/.ghcup/bin/ghcup
-          ~/.ghcup/bin/ghcup install ghc 9.4.8
-          ~/.ghcup/bin/ghcup install cabal 3.6.2.0
+          apt-get update -y
+          apt-get upgrade -y
+          apt-get install -y nodejs pkg-config liblzma-dev
       - uses: actions/checkout@v4
       - name: Install dependencies
         run: |
-          ~/.ghcup/bin/ghcup run --ghc 9.4.8 --cabal 3.6.2.0 -- cabal update
-          ~/.ghcup/bin/ghcup run --ghc 9.4.8 --cabal 3.6.2.0 -- cabal build slackbuilder-test
-      - run: ~/.ghcup/bin/ghcup run --ghc 9.4.8 --cabal 3.6.2.0 -- cabal test --test-show-details=direct
+          cabal update
+      - run: cabal test --test-show-details=streaming
diff --git a/lib/SlackBuilder/Info.hs b/lib/SlackBuilder/Info.hs
index 3e0c839..7617e15 100644
--- a/lib/SlackBuilder/Info.hs
+++ b/lib/SlackBuilder/Info.hs
@@ -90,8 +90,8 @@ packageName = takeWhile1P Nothing isNameToken
         || x == Word8._underscore
 
 parseInfoFile :: GenParser PackageInfo
-parseInfoFile = PackageInfo
-    <$> (Char8.unpack <$> packagePrgnam)
+parseInfoFile = PackageInfo . Char8.unpack
+    <$> packagePrgnam
     <*> (Text.decodeUtf8 <$> variableEntry "VERSION")
     <*> (Text.decodeUtf8 <$> variableEntry "HOMEPAGE")
     <*> packageDownloads "DOWNLOAD"