Update CI haskell-actions/setup (#569)

* Update CI haskell-actions/setup
* Drop minor version on actions/cache
* Bump humbletim/setup-vulkan-sdk
* Request more sdk components
* Fix shellcheck
* Create /usr/local/lib before ln
* Remove a clutch
* Force system GHC
* Bump stackage lts to match latest 9.6 minor
* Bump installed ghc to match lts
* Exclude macos builds for older GHCs

Author: dpwiz

.github/workflows/ci.yml

@@ -14,18 +14,23 @@ jobs:
       matrix:
         ghc: ['8.10', '9.0', '9.2']
         os: [ubuntu-latest, macOS-latest, windows-latest]
+        exclude:
+          - os: macOS-latest
+            ghc: '8.10'
+          - os: macOS-latest
+            ghc: '9.0'
       fail-fast: false
 
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - uses: haskell/actions/setup@v2
+    - uses: haskell-actions/setup@v2
       id: setup-haskell
       with:
         ghc-version: ${{ matrix.ghc }}
 
-    - uses: actions/cache@v4.0.2
+    - uses: actions/cache@v4
       with:
         path: |
           ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
@@ -67,18 +72,20 @@ jobs:
         EOF
 
     - name: Prepare Vulkan SDK
-      uses: humbletim/setup-vulkan-sdk@v1.2.0
+      uses: humbletim/setup-vulkan-sdk@v1.2.1
       with:
         vulkan-query-version: latest
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang, SPIRV-Cross, SPIRV-Tools, SPIRV-Reflect, SPIRV-Headers
         vulkan-use-cache: true
 
     - name: Make libvulkan.1.dylib available on OSX
       if: matrix.os == 'macOS-latest'
       shell: bash
       run: |
         file $VULKAN_SDK/lib/libvulkan.1.dylib
-        ln -s $VULKAN_SDK/lib/libvulkan.1.dylib /usr/local/lib/libvulkan.1.dylib
+        ls -la /usr/local/ /usr/local/lib/ || true
+        mkdir -p /usr/local/lib/ || true
+        ln -s $VULKAN_SDK/lib/libvulkan.1.dylib /usr/local/lib/libvulkan.1.dylib || true
 
     - name: Inform Cabal about Vulkan
       shell: bash
@@ -90,8 +97,6 @@ jobs:
         printf "%s\n" "$VULKAN_SDK/bin" >> "$GITHUB_PATH"
         if uname -s | grep -i mingw; then sep=';'; else sep=':'; fi
         printf "%s\n" "PKG_CONFIG_PATH=${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}${sep}}$VULKAN_SDK/lib/pkgconfig" >> "$GITHUB_ENV"
-        # until this is fixed https://github.com/haskell/cabal/issues/7339
-        printf "%s\n" "DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}${sep}}$VULKAN_SDK/lib" >> "$GITHUB_ENV"
 
     - name: Remove openxr
       run: |
@@ -150,14 +155,14 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - uses: haskell/actions/setup@v2
+    - uses: haskell-actions/setup@v2
       with:
         stack-version: 'latest'
         enable-stack: true
-        ghc-version: '8.10'
+        ghc-version: '9.6.7'
 
     - name: Cache stack things
-      uses: actions/cache@v4.0.2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.stack
@@ -201,10 +206,10 @@ jobs:
         brew install pkg-config sdl2
 
     - name: Prepare Vulkan SDK
-      uses: humbletim/setup-vulkan-sdk@v1.2.0
+      uses: humbletim/setup-vulkan-sdk@v1.2.1
       with:
         vulkan-query-version: latest
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang, SPIRV-Cross, SPIRV-Tools, SPIRV-Reflect, SPIRV-Headers
         vulkan-use-cache: true
 
     - name: Inform Stack about Vulkan

scripts/release.sh

@@ -33,7 +33,7 @@ while [[ "$#" -gt 0 ]]; do
   shift
 done
 
-if [ $help ]; then
+if [ "$help" ]; then
   me=$(basename "$0")
   cat <<EOF
 $me: Create releases for the tags on HEAD. Fails when there are no relevant
@@ -72,7 +72,7 @@ declare -a tagMap
 for i in "${tags[@]}"; do
   for r in "${!tagNames[@]}"; do
     if [[ "$i" =~ ${tagNames[$r]} ]]; then
-      tagMap[$r]=$i
+      tagMap[r]=$i
     fi
   done
 done

scripts/update.sh

@@ -28,7 +28,7 @@ while [[ "$#" -gt 0 ]]; do
   shift
 done
 
-if [ $help ]; then
+if [ "$help" ]; then
   me=$(basename "$0")
   cat <<EOF
 $me: Update Vulkan-Docs and regenerate source
@@ -58,7 +58,7 @@ git -C generate-new/Vulkan-Docs fetch --tags
 
 if git -C generate-new/Vulkan-Docs describe --tags | grep "$version"; then
   echo "Vulkan-Docs is already at $version"
-  if ! [ $force ]; then
+  if ! [ "$force" ]; then
     exit 0
   fi
 fi

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-22.42
+resolver: lts-22.44
 packages:
 - .
 - utils
@@ -9,13 +9,15 @@ extra-deps:
 # - autoapply-0.4.1.1
 - git: https://github.com/dpwiz/autoapply.git
   commit: 640ed1a689484fc307e1bab7c06db1027b28c87c
-- unification-fd-0.12.0
+- unification-fd-0.12.0.2
 - derive-storable-0.3.1.0
 - derive-storable-plugin-0.2.3.7
 
+# use ghcup, nix, setup actions
+system-ghc: true
+install-ghc: false
+
 allow-newer: true
-allow-newer-deps:
-- unification-fd
 
 nix:
   enable: false