Setup haskell-actions

hasktorch · Apr 25, 2024 · a22b6ba · a22b6ba
1 parent 5648b7d
commit a22b6ba
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/cabal-macos.yaml b/.github/workflows/cabal-macos.yaml
@@ -13,6 +13,11 @@ jobs:
       with:
         submodules: true
 
+    - uses: haskell-actions/setup@v2.7.1
+      with:
+        ghc-version: '9.6.4'
+        cabal-version: '3.10.2.1'
+
     - name: Setup packages
       run: |
         /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
@@ -24,16 +29,6 @@ jobs:
         brew install libtokenizers || true
         #pushd deps/ ; ./get-deps.sh -a cpu -c ;popd
 
-    - name: Setup Haskell
-      run: |
-        echo "$HOME/.ghcup/bin" >> "${GITHUB_PATH}"
-        ghcup install ghc --set ${{ env.GHC }}
-
-      ## GHCup is preinstalled on the GHA runners. This would be the magic incantation to install it:
-      # curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
-      ## Cabal is preinstalled on the GHA runners
-      # ghcup install cabal
-
     - name: Information about the Haskell setup
       run: |
         echo "PATH = ${PATH}"

diff --git a/.github/workflows/stack-linux.yml b/.github/workflows/stack-linux.yml
@@ -19,6 +19,11 @@ jobs:
         sudo apt autoclean -y || true
         docker rmi $(docker image ls -aq)
         df -h
+    - uses: haskell-actions/setup@v2.7.1
+      with:
+        ghc-version: '9.6.5'
+        enable-stack: true
+        stack-version: 'latest'
     - name: Setup packages
       run: |
         sudo rm -f /etc/apt/sources.list.d/sbt.list

diff --git a/.github/workflows/stack-macos.yaml b/.github/workflows/stack-macos.yaml
@@ -9,6 +9,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
+    - uses: haskell-actions/setup@v2.7.1
+      with:
+        ghc-version: '9.6.5'
+        enable-stack: true
+        stack-version: 'latest'
     - name: Setup tool-chains
       run: |
         /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"