Merge pull request #831 from avh4/perkee-bump-ghc-967

Merge #829

Author: avh4

.gitattributes

@@ -0,0 +1,6 @@
+avh4-lib/avh4-lib.cabal linguist-generated=true
+elm-format-lib/elm-format-lib.cabal linguist-generated=true
+elm-format-markdown/elm-format-markdown.cabal linguist-generated=true
+elm-format-test-lib/elm-format-test-lib.cabal linguist-generated=true
+elm-format.cabal linguist-generated=true
+Shakefile/build-elm-format.cabal linguist-generated=true

.github/actions/haskell/action.yml

@@ -5,17 +5,17 @@ runs:
       if: ${{ runner.os == 'Linux' }}
       shell: bash
       run: sudo chown -R "$USER" /usr/local/.ghcup
-    - uses: haskell/actions/setup@v2
+    - uses: haskell-actions/setup@v2
       name: Setup Haskell
       id: setup-haskell
       with:
-        ghc-version: 9.4.4
+        ghc-version: 9.6.7
     - name: Verify Haskell version
       shell: bash
       run: |
         cabal --version
         ghc --version
-        [[ $(ghc --numeric-version) == 9.4.4 ]]
+        [[ $(ghc --numeric-version) == 9.6.7 ]]
         file "$(which cabal)"
         file "$(which ghc)"
     - name: Cache ~/.cabal/store

.github/workflows/Build release (lamdera-community).yml

@@ -19,7 +19,7 @@ jobs:
           runner: [ self-hosted, macOS, ARM64 ]
           archive-label: macOS-arm64
           ghc:
-            version: "9.4.4"
+            version: "9.6.7"
             build-platform: aarch64-apple-darwin
 
     name: release-${{ matrix.build.name }}

.gitpod.yml

@@ -7,8 +7,8 @@ tasks:
     init: |
       curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh
       source "$GHCUP_INSTALL_BASE_PREFIX/.ghcup/env"
-      ghcup install ghc 9.4.4
-      ghcup set ghc 9.4.4
+      ghcup install ghc 9.6.7
+      ghcup set ghc 9.6.7
       ghcup install cabal
       cabal update
       ./dev/build.sh

Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:latest as build
 
-ENV GHC_VERSION 9.4.4
+ENV GHC_VERSION 9.6.7
 
 ENV LANG C.UTF-8
 

README.md

@@ -305,8 +305,8 @@ git clone https://github.com/avh4/elm-format.git
 cd elm-format
 
 # initial setup
-ghcup install ghc 9.4.4
-ghcup set ghc 9.4.4
+ghcup install ghc 9.6.7
+ghcup set ghc 9.6.7
 cabal install hpack
 
 # build

Shakefile/src/Shakefiles/Haskell.hs

@@ -112,7 +112,7 @@ cabalProject name sourceFiles sourcePatterns deps testPatterns testDeps =
 cabalBuildDir :: String -> Action FilePath
 cabalBuildDir projectName = do
     version <- readFile' ("_build/cabal" </> projectName </> "version")
-    return $ "dist-newstyle" </> "build" </> Shakefiles.Platform.cabalInstallOs </> "ghc-9.4.4" </> projectName ++ "-" ++ version
+    return $ "dist-newstyle" </> "build" </> Shakefiles.Platform.cabalInstallOs </> "ghc-9.6.7" </> projectName ++ "-" ++ version
 
 
 executable :: String -> String -> String -> Rules ()

Shakefile/src/Shakefiles/Haskell/Hpc.hs

@@ -15,10 +15,10 @@ mergeTixFiles tixs out = do
 rules :: String -> Rules ()
 rules gitSha = do
     let hpcConfig =
-            [ "--hpcdir=./dist-newstyle/_coverage/build/x86_64-linux/ghc-9.4.4/elm-format-0.8.7/hpc/vanilla/mix/elm-format"
-            , "--hpcdir=./dist-newstyle/_coverage/build/x86_64-linux/ghc-9.4.4/avh4-lib-0.0.0.1/hpc/vanilla/mix/avh4-lib-0.0.0.1"
-            , "--hpcdir=./dist-newstyle/_coverage/build/x86_64-linux/ghc-9.4.4/elm-format-lib-0.0.0.1/hpc/vanilla/mix/elm-format-lib-0.0.0.1"
-            , "--hpcdir=./dist-newstyle/_coverage/build/x86_64-linux/ghc-9.4.4/elm-format-markdown-0.0.0.1/hpc/vanilla/mix/elm-format-markdown-0.0.0.1"
+            [ "--hpcdir=./dist-newstyle/_coverage/build/x86_64-linux/ghc-9.6.7/elm-format-0.8.7/hpc/vanilla/mix/elm-format"
+            , "--hpcdir=./dist-newstyle/_coverage/build/x86_64-linux/ghc-9.6.7/avh4-lib-0.0.0.1/hpc/vanilla/mix/avh4-lib-0.0.0.1"
+            , "--hpcdir=./dist-newstyle/_coverage/build/x86_64-linux/ghc-9.6.7/elm-format-lib-0.0.0.1/hpc/vanilla/mix/elm-format-lib-0.0.0.1"
+            , "--hpcdir=./dist-newstyle/_coverage/build/x86_64-linux/ghc-9.6.7/elm-format-markdown-0.0.0.1/hpc/vanilla/mix/elm-format-markdown-0.0.0.1"
             , "--srcdir=."
             , "--srcdir=avh4-lib"
             , "--srcdir=elm-format-lib"

avh4-lib/avh4-lib.cabal

@@ -28,7 +28,7 @@ ghc-options:
 dependencies:
   array: ">= 0.5.4.0 && < 0.6"
   base: ">= 4.15.0.0 && < 5"
-  bytestring: ">= 0.11.3.0 && < 0.12"
+  bytestring: ">= 0.11.3.0 && < 0.13"
   directory: ">= 1.3.6.2 && < 2"
   filepath: ">= 1.4.2.1 && < 2"
   mtl: ">= 2.2.2 && < 3"