WIP upgrade all builds for GHC 9.4

Author: supermario

.github/workflows/build-linux-arm64.yml

@@ -2,6 +2,8 @@ on:
   push:
     branches:
       - distribute
+      - linux
+      - linux-arm64
 
 name: Build Linux arm64
 jobs:

.github/workflows/build-linux-x86_64.yml

@@ -3,6 +3,7 @@ on:
     branches:
       - distribute
       - linux
+      - linux-x86_64
 
 name: Build Linux x86_64
 jobs:

.github/workflows/build-macos-arm64.yml

@@ -3,6 +3,7 @@ on:
     branches:
       - distribute
       - macos
+      - macos-arm64
 
 name: Build MacOS arm64
 jobs:
@@ -22,6 +23,5 @@ jobs:
       - name: Run distribution script
         run: |
           test -x "$(which ghcup)" && curl https://downloads.haskell.org/~ghcup/aarch64-apple-darwin-ghcup -o ~/.local/bin/ghcup && chmod a+x ~/.local/bin/ghcup
-          brew install llvm@12
           cd distribution
           ./build-macos-arm64.sh

.github/workflows/build-macos-x86_64.yml

@@ -3,6 +3,7 @@ on:
     branches:
       - distribute
       - macos
+      - macos-x86_64
 
 name: Build MacOS x86_64
 jobs:
@@ -22,6 +23,5 @@ jobs:
       - name: Run distribution script
         run: |
           test -x "$(which ghcup)" && curl https://downloads.haskell.org/~ghcup/aarch64-apple-darwin-ghcup -o ~/.local/bin/ghcup && chmod a+x ~/.local/bin/ghcup
-          brew install llvm@12
           cd distribution
           ./build-macos-x86_64.sh

builder/src/BackgroundWriter.hs

@@ -15,6 +15,8 @@ import Data.Foldable (traverse_)
 import qualified File
 
 
+import Lamdera ((&))
+import qualified Lamdera
 
 -- BACKGROUND WRITER
 
@@ -36,7 +38,7 @@ writeBinary :: (Binary.Binary a) => Scope -> FilePath -> a -> IO ()
 writeBinary (Scope workList) path value =
   do  mvar <- newEmptyMVar
       _ <- forkIO (File.writeBinary path value >> putMVar mvar ())
+        & Lamdera.alternativeImplementation (forkIO (Lamdera.writeBinaryValueStrict path value >> putMVar mvar ()))
       oldWork <- takeMVar workList
       let !newWork = mvar:oldWork
       putMVar workList newWork
-

builder/src/Stuff.hs

@@ -48,19 +48,16 @@ stuff root =
 details :: FilePath -> FilePath
 details root =
   stuff root </> "d.dat"
-    & Lamdera.alternativeImplementation (stuff root </> "d.x.dat")
 
 
 interfaces :: FilePath -> FilePath
 interfaces root =
   stuff root </> "i.dat"
-    & Lamdera.alternativeImplementation (stuff root </> "i.x.dat")
 
 
 objects :: FilePath -> FilePath
 objects root =
   stuff root </> "o.dat"
-    & Lamdera.alternativeImplementation (stuff root </> "o.x.dat")
 
 
 prepublishDir :: FilePath -> FilePath

cabal.config

@@ -1,2 +1,2 @@
 profiling: False
-library-profiling: True
+library-profiling: True

cabal.project

@@ -4,204 +4,3 @@ packages:
     ./vendor/elm-format/elm-format-lib
     ./vendor/elm-format/avh4-lib
     ./vendor/elm-format
-
-allow-older: avh4-lib:*, elm-format:*, elm-format-lib:*, elm-format-markdown:*
-allow-newer: avh4-lib:*, elm-format:*, elm-format-lib:*, elm-format-markdown:*
-
--- Produced with `stack ls dependencies` & manually formatted
-constraints:
-    Cabal ==3.4.1.0,
-    HTTP ==4000.3.16,
-    HUnit ==1.6.2.0,
-    OneTuple ==0.3.1,
-    QuickCheck ==2.14.2,
-    SHA ==1.6.4.4,
-    StateVar ==1.2.2,
-    aeson ==2.0.3.0,
-    ansi-terminal ==0.11,
-    ansi-wl-pprint ==0.6.9,
-    appar ==0.1.8,
-    array ==0.5.4.0,
-    asn1-encoding ==0.9.6,
-    asn1-parse ==0.9.5,
-    asn1-types ==0.3.4,
-    assoc ==1.0.2,
-    async ==2.2.4,
-    attoparsec ==0.14.4,
-    auto-update ==0.1.6,
-    avh4-lib ==0.0.0.1,
-    base ==4.15.1.0,
-    base-compat ==0.11.2,
-    base-compat-batteries ==0.11.2,
-    base-orphans ==0.8.7,
-    base64-bytestring ==1.2.1.0,
-    basement ==0.0.15,
-    bifunctors ==5.5.13,
-    bimap ==0.4.0,
-    binary ==0.8.8.0,
-    blaze-builder ==0.4.2.2,
-    broadcast-chan ==0.2.1.2,
-    bsb-http-chunked ==0.0.0.4,
-    byteorder ==1.0.4,
-    bytestring ==0.10.12.1,
-    bytestring-builder ==0.10.8.2.0,
-    cabal-doctest ==1.0.9,
-    call-stack ==0.4.0,
-    case-insensitive ==1.2.1.0,
-    cereal ==0.5.8.3,
-    charset ==0.3.9,
-    clock ==0.8.3,
-    colour ==2.3.6,
-    command ==0.1.1,
-    comonad ==5.0.8,
-    conduit ==1.3.4.3,
-    conduit-extra ==1.3.6,
-    connection ==0.3.1,
-    containers ==0.6.4.1,
-    contravariant ==1.5.5,
-    cookie ==0.4.5,
-    cryptohash-md5 ==0.11.101.0,
-    cryptohash-sha1 ==0.11.101.0,
-    cryptonite ==0.29,
-    data-default-class ==0.1.2.0,
-    data-fix ==0.3.2,
-    deepseq ==1.4.5.0,
-    digest ==0.0.1.3,
-    directory ==1.3.6.2,
-    distributive ==0.6.2.1,
-    dlist ==1.0,
-    double-conversion ==2.0.4.1,
-    easy-file ==0.2.2,
-    edit-distance ==0.2.2.1,
-    elm ==0.19.1,
-    elm-format ==0.8.5,
-    elm-format-lib ==0.0.0.1,
-    elm-format-markdown ==0.0.0.1,
-    entropy ==0.4.1.10,
-    exceptions ==0.10.4,
-    fast-logger ==3.1.1,
-    file-embed ==0.0.15.0,
-    filelock ==0.1.1.5,
-    filemanip ==0.3.6.3,
-    filepath ==1.4.2.1,
-    fold-debounce ==0.2.0.9,
-    formatting ==7.1.3,
-    fsnotify ==0.3.0.1,
-    ghc-bignum ==1.1,
-    ghc-boot-th ==9.0.2,
-    ghc-prim ==0.7.0,
-    githash ==0.1.6.3,
-    hashable ==1.3.5.0,
-    haskeline ==0.8.2,
-    hfsevents ==0.1.6,
-    hourglass ==0.2.12,
-    http-client ==0.7.13.1,
-    http-client-tls ==0.3.6.1,
-    http-date ==0.0.11,
-    http-types ==0.12.3,
-    http2 ==3.0.3,
-    indexed-traversable ==0.1.2,
-    indexed-traversable-instances ==0.1.1.1,
-    integer-gmp ==1.1,
-    integer-logarithms ==1.0.3.1,
-    io-streams ==1.5.2.2,
-    io-streams-haproxy ==1.0.1.0,
-    iproute ==1.7.12,
-    language-glsl ==0.3.0,
-    lifted-base ==0.2.3.12,
-    listsafe ==0.1.0.1,
-    main-tester ==0.2.0.1,
-    megaparsec ==9.2.2,
-    memory ==0.16.0,
-    mime-types ==0.1.1.0,
-    monad-control ==1.0.3.1,
-    mono-traversable ==1.0.15.3,
-    mtl ==2.2.2,
-    natural-sort ==0.1.2,
-    neat-interpolation ==0.5.1.3,
-    network ==3.1.2.7,
-    network-byte-order ==0.1.6,
-    network-info ==0.2.1,
-    network-uri ==2.6.4.1,
-    old-locale ==1.0.0.7,
-    old-time ==1.1.0.3,
-    optparse-applicative ==0.16.1.0,
-    parsec ==3.1.14.0,
-    parser-combinators ==1.3.0,
-    parsers ==0.12.11,
-    pem ==0.2.4,
-    pretty ==1.1.3.6,
-    prettyclass ==1.0.0.0,
-    primitive ==0.7.3.0,
-    process ==1.6.13.2,
-    psqueues ==0.2.7.3,
-    random ==1.2.1.1,
-    raw-strings-qq ==1.1,
-    readable ==0.3.1,
-    regex-base ==0.94.0.2,
-    regex-posix ==0.96.0.1,
-    regex-posix-clib ==2.7,
-    relude ==1.0.0.1,
-    resourcet ==1.2.6,
-    rts ==1.0.2,
-    safe ==0.3.19,
-    safe-exceptions ==0.1.7.3,
-    scientific ==0.3.7.0,
-    semialign ==1.2.0.1,
-    semigroupoids ==5.3.7,
-    simple-sendfile ==0.2.30,
-    snap-core ==1.0.5.0,
-    snap-server ==1.1.2.0,
-    socks ==0.6.1,
-    split ==0.2.3.5,
-    splitmix ==0.1.0.4,
-    stm ==2.5.0.0,
-    stm-delay ==0.1.1.1,
-    streaming-commons ==0.2.2.5,
-    strict ==0.4.0.1,
-    stringsearch ==0.3.6.6,
-    tagged ==0.8.6.1,
-    template-haskell ==2.17.0.0,
-    terminfo ==0.4.1.5,
-    text ==1.2.5.0,
-    text-short ==0.1.5,
-    th-abstraction ==0.4.5.0,
-    th-compat ==0.1.4,
-    these ==1.1.1.1,
-    time ==1.9.3,
-    time-compat ==1.9.6.1,
-    time-manager ==0.0.0,
-    timeout ==0.1.1,
-    tls ==1.5.8,
-    transformers ==0.5.6.2,
-    transformers-base ==0.4.6,
-    transformers-compat ==0.6.6,
-    tree-diff ==0.2.2,
-    typed-process ==0.2.10.1,
-    unicode-show ==0.1.1.1,
-    unix ==2.7.2.2,
-    unix-compat ==0.5.4,
-    unix-time ==0.4.8,
-    unliftio ==0.2.23.0,
-    unliftio-core ==0.2.0.1,
-    unordered-containers ==0.2.17.0,
-    utf8-string ==1.0.2,
-    uuid ==1.3.15,
-    uuid-types ==1.0.5,
-    vault ==0.3.1.5,
-    vector ==0.12.3.1,
-    vector-algorithms ==0.8.0.4,
-    wai ==3.2.3,
-    wai-logger ==2.4.0,
-    warp ==3.3.21,
-    websockets ==0.12.7.3,
-    websockets-snap ==0.10.3.1,
-    witherable ==0.4.2,
-    word8 ==0.1.3,
-    x509 ==1.7.7,
-    x509-store ==1.6.9,
-    x509-system ==1.6.7,
-    x509-validation ==1.6.12,
-    zip-archive ==0.4.2.2,
-    zlib ==0.6.3.0,
-    zlib-bindings ==0.1.1.5,

distribution/build-linux-arm32v7-musl.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ex                                                   # Be verbose and exit immediately on error instead of trying to continue
 
-version="1.2.0"
+source "common.sh"
 os="linux"
 arch="arm32v7"
 

distribution/build-linux-arm64-musl.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ex                                                   # Be verbose and exit immediately on error instead of trying to continue
 
-version="1.2.0"
+source "common.sh"
 os="linux"
 arch="arm64"
 

distribution/build-linux-x86_64-musl.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ex                                                   # Be verbose and exit immediately on error instead of trying to continue
 
-version="1.2.0"
+source "common.sh"
 os="linux"
 arch="x86_64"
 

distribution/build-macos-arm64.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ex                                                   # Be verbose and exit immediately on error instead of trying to continue
 
-version="1.2.0"
+source "common.sh"
 os="macos"
 arch="arm64"
 
@@ -16,28 +16,20 @@ if ! uname -a | grep "Darwin" && uname -a | grep "arm64"; then
   exit 1;
 fi
 
-stackVersion=2.9.3
-isolate=~/.ghcup/macos-$arch
+stackVersion=2.11.1
+isolate=~/.ghcup/$os-$arch
 mkdir -p $isolate
 stack="$isolate/stack"
 
                                                           # Ensure correct arch toolchain is installed, or install it
                                                           # Hopefully in future ghcup has better multi-arch support
-if [ ! -f $stack ]; then
+if [ ! -f "$stack" ]; then
   ghcup install stack "$stackVersion" --isolate "$isolate" --force
 fi
 
-# /opt/homebrew/opt/llvm/bin/opt --version                # The arm64 build currently requires llvm until we get to GHC 9.4+
-
-
 cd "$scriptDir/.."                                        # Move into the project root
 git submodule init && git submodule update
 
-ffiLibs="$(xcrun --show-sdk-path)/usr/include/ffi"        # Workaround for GHC9.0.2 bug until we can use GHC9.2.3+
-export C_INCLUDE_PATH=$ffiLibs                            # https://gitlab.haskell.org/ghc/ghc/-/issues/20592#note_436353
-
-export PATH="/opt/homebrew/opt/llvm@12/bin:$PATH"         # The arm64 build currently requires llvm until we get to GHC 9.4+
-
 $stack install --local-bin-path $dist
 
 cp $dist/lamdera $bin                                     # Copy built binary to dist