[ ci ] Grep only the digits from the GHC version

agda · Nov 30, 2024 · df3b47b · df3b47b
1 parent 3f010e1
commit df3b47b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/test-linux.yaml b/.github/workflows/test-linux.yaml
@@ -21,7 +21,7 @@ jobs:
     - name: 🔍 Determine stack resolver & GHC
       run: |
         STACK_RESOLVER=$(yq .resolver stack.yaml)
-        GHC_VERSION=$(yq .compiler stack.yaml)
+        GHC_VERSION=$(echo $(yq .compiler stack.yaml) | cut -c 5-)
         echo STACK_RESOLVER="${STACK_RESOLVER}" >> "${GITHUB_ENV}"
         echo GHC_VERSION="${GHC_VERSION}" >> "${GITHUB_ENV}"
 
@@ -48,15 +48,14 @@ jobs:
 
     # actions:
 
-    - name: ⏬ Install stack
-      run: |
-        # mkdir -p ~/.local/bin
-        # export PATH=~/.local/bin:$PATH
-        ## Stack is preinstalled on the GHA runners
-        # curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack
-        # if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
-        stack --version
-
+    - name: ⏬ Setup Haskell
+      uses: haskell-actions/setup@v2
+      id: setup-haskell
+      with:
+        ghc-version: ${{ env.GHC_VERSION }}
+        enable-stack: true
+        stack-version: 'latest'
+
     - name: ⏬ Install dependencies
       run: |
         stack build --only-dependencies

diff --git a/.github/workflows/test-mac.yaml b/.github/workflows/test-mac.yaml
@@ -21,7 +21,7 @@ jobs:
     - name: 🔍 Determine stack resolver & GHC
       run: |
         STACK_RESOLVER=$(yq .resolver stack.yaml)
-        GHC_VERSION=$(yq .compiler stack.yaml)
+        GHC_VERSION=$(echo $(yq .compiler stack.yaml) | cut -c 5-)
         echo STACK_RESOLVER="${STACK_RESOLVER}" >> "${GITHUB_ENV}"
         echo GHC_VERSION="${GHC_VERSION}" >> "${GITHUB_ENV}"
 

diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml
@@ -4,7 +4,7 @@ name: CI (Windows)
 
 on:
   push:
-    branches: [master, ci-*]
+    branches: [master, ci-*, ci]
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
   pull_request:
@@ -33,7 +33,7 @@ jobs:
       run: |
         STACK_ROOT="C:/Users/runneradmin/AppData/Local/Programs/stack/x86_64-windows"
         STACK_RESOLVER=$(yq .resolver stack.yaml)
-        GHC_VERSION=$(yq .compiler stack.yaml)
+        GHC_VERSION=$(echo $(yq .compiler stack.yaml) | cut -c 5-)
         echo STACK_ROOT="${STACK_ROOT}"         >> "${GITHUB_ENV}"
         echo STACK_RESOLVER="${STACK_RESOLVER}" >> "${GITHUB_ENV}"
         echo GHC_VERSION="${GHC_VERSION}" >> "${GITHUB_ENV}"