[ ci ] Remove hardcoded Stack root on Unix

agda · Dec 3, 2024 · bc9458c · bc9458c
1 parent aaaad2f
commit bc9458c
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 32 deletions.
diff --git a/.github/workflows/test-unix.yaml b/.github/workflows/test-unix.yaml
@@ -2,6 +2,10 @@
 
 name: CI (Unix)
 
+defaults:
+  run:
+    shell: bash
+
 on:
   push:
     branches: [master, ci-*, ci]
@@ -25,13 +29,26 @@ jobs:
     - name: 🏗 Install yq
       uses: frenck/action-setup-yq@v1
 
-    - name: 🔍 Determine stack resolver & GHC
+    - name: 🔍 Determine Stack resolver & GHC version
       run: |
-        STACK_ROOT="$(stack path --stack-root)"
         STACK_RESOLVER=$(yq .resolver 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}"
+        echo GHC_VERSION="${GHC_VERSION}"       >> "${GITHUB_ENV}"
+
+    - name: 🏗 Setup Haskell
+      if : runner.os == 'macOS'
+      uses: haskell-actions/setup@v2
+      id: setup-haskell
+      with:
+        ghc-version: ${{ env.GHC_VERSION }}
+        enable-stack: true
+        stack-version: 'latest'
+
+    - name: 🔍 Determine Stack root
+      run: |
+        STACK_ROOT="$(stack path --stack-root)"
+        echo STACK_ROOT="${STACK_ROOT}"         >> "${GITHUB_ENV}"
 
     # things to be restored:
     # Include STACK_RESOLVER in cache key, otherwise caches accumulate build products for different resolvers.
@@ -60,13 +77,13 @@ jobs:
       run: |
         echo PKG_CONFIG_PATH="$(brew --prefix)/opt/icu4c/lib/pkgconfig" >> "${GITHUB_ENV}"
 
-    - name: ⏬ Setup Haskell
-      uses: haskell-actions/setup@v2
-      id: setup-haskell
-      with:
-        ghc-version: ${{ env.GHC_VERSION }}
-        enable-stack: true
-        stack-version: 'latest'
+    # - name: ⏬ Setup Haskell
+    #   uses: haskell-actions/setup@v2
+    #   id: setup-haskell
+    #   with:
+    #     ghc-version: ${{ env.GHC_VERSION }}
+    #     enable-stack: true
+    #     stack-version: 'latest'
 
     - name: 🔨 Build
       run: stack build

diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml
@@ -25,19 +25,26 @@ jobs:
     - name: 🏗 Install yq
       uses: frenck/action-setup-yq@v1
 
-    - name: 🔍 Determine stack root and resolver and GHC
+    - name: 🔍 Determine Stack resolver & GHC version
       run: |
-        STACK_ROOT="$(stack path --stack-root)"
         STACK_RESOLVER=$(yq .resolver 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}"
-      # run: |
-      #   STACK_ROOT="$(stack --system-ghc --no-install-ghc path --stack-root || echo "C:/Users/runneradmin/AppData/Local/Programs/stack/x86_64-windows")"
-      #   echo "STACK_ROOT = ${STACK_ROOT}"
-      #   echo STACK_ROOT="${STACK_ROOT}" >> "${GITHUB_ENV}"
-      # What about C:/Users/runneradmin/AppData/Roaming/stack ?
+        echo GHC_VERSION="${GHC_VERSION}"       >> "${GITHUB_ENV}"
+
+    - name: 🏗 Setup Haskell
+      if : runner.os == 'macOS'
+      uses: haskell-actions/setup@v2
+      id: setup-haskell
+      with:
+        ghc-version: ${{ env.GHC_VERSION }}
+        enable-stack: true
+        stack-version: 'latest'
+
+    - name: 🔍 Determine Stack root
+      run: |
+        STACK_ROOT="$(stack path --stack-root)"
+        echo STACK_ROOT="${STACK_ROOT}"         >> "${GITHUB_ENV}"
 
     # things to be restored:
     # Include STACK_RESOLVER in cache key, otherwise caches accumulate build products for different resolvers.
@@ -65,23 +72,23 @@ jobs:
       run: |
         stack exec -- pacman -S --noconfirm mingw-w64-x86_64-icu mingw-w64-x86_64-pkgconf
 
-    # - name: 📸 Build Snapshot
-    #   run: |
-    #     stack build --no-terminal --only-snapshot -j1
+    - name: 📸 Build Snapshot
+      run: |
+        stack build --no-terminal --only-snapshot -j1
 
-    # - name: 🧰 Build Dependencies
-    #   run: |
-    #     stack build --no-terminal --only-dependencies
+    - name: 🧰 Build Dependencies
+      run: |
+        stack build --no-terminal --only-dependencies
 
-    # - name: 🔨 Build and run tests
-    #   run: |
-    #     stack test
+    - name: 🧪 Run tests
+      run: |
+        stack test
 
-    - name: 🔨 Build
-      run: stack build
+    # - name: 🔨 Build
+    #   run: stack build
 
-    - name: 🧪 Run tests
-      run: stack test
+    # - name: 🧪 Run tests
+    #   run: stack test
 
     # things to be cached