diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76349e5..c7bfcd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ on: jobs: nix-build: name: nix-build - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: checkout @@ -36,11 +36,11 @@ jobs: - name: build-frontend run: | - nix develop --command bash -c "cd frontend && exec ./build.sh --low-memory-unused --converge --gufa --flatten --rereloop -Oz" + nix develop --command bash -c "cd frontend && exec ./build.sh --low-memory-unused --converge -O4" ghcup-build: name: ghcup-build - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: checkout @@ -56,13 +56,12 @@ jobs: - name: cabal run: | - ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/develop/ghcup-prereleases-0.0.8.yaml - ghcup install cabal --set 3.15.0.0.2024.10.3 + ghcup install cabal --set latest - name: wasm32-wasi-ghc run: | - ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/develop/ghcup-cross-0.0.8.yaml - ghcup install ghc --set wasm32-wasi-9.10.1.20241021 -- $CONFIGURE_ARGS + ghcup config add-release-channel https://gitlab.haskell.org/haskell-wasm/ghc-wasm-meta/-/raw/master/ghcup-wasm-0.0.9.yaml + ghcup install ghc --set wasm32-wasi-9.12 -- $CONFIGURE_ARGS - uses: dw-labs-org/dart-sass-gha@v1 @@ -92,11 +91,11 @@ jobs: - name: build-frontend run: | cd frontend - ./build.sh --low-memory-unused --converge --gufa --flatten --rereloop -Oz + ./build.sh --low-memory-unused --converge -O4 non-nix-build: name: non-nix-build - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: pages: write id-token: write @@ -113,7 +112,7 @@ jobs: ~/.ghc-wasm/add_to_github_path.sh popd env: - FLAVOUR: '9.10' + FLAVOUR: '9.12' - uses: dw-labs-org/dart-sass-gha@v1 @@ -134,7 +133,7 @@ jobs: - name: build-frontend run: | cd frontend - ./build.sh --low-memory-unused --converge --gufa --flatten --rereloop -Oz + ./build.sh --low-memory-unused --converge -O4 - name: upload-pages-artifact uses: actions/upload-pages-artifact@v3 diff --git a/cabal.project b/cabal.project index abb82a4..7f4cfda 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,16 @@ packages: . hs2048 -index-state: 2024-11-15T08:25:42Z +index-state: 2025-02-07T08:16:42Z + +allow-newer: + all:base + +-- Fix building with recent text, remove when miso-1.8.6.0 or newer +-- is released +source-repository-package + type: git + location: https://github.com/dmjio/miso.git + tag: e411f3e2872465f37eb53b6de4542010a105b53a if arch(wasm32) -- Required for TemplateHaskell. When using wasm32-wasi-cabal from diff --git a/flake.lock b/flake.lock index 8a02038..a217c4e 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "host": "gitlab.haskell.org", - "lastModified": 1732635833, - "narHash": "sha256-7dYfVCxt9qnvFrlccFSO1i4FrSdU8SMJhF5KxH2sROY=", + "lastModified": 1738960378, + "narHash": "sha256-oV++/4mcNUD7ktQUOzeiIJ4/CgWJK5b1SwVrOCcNelA=", "owner": "haskell-wasm", "repo": "ghc-wasm-meta", - "rev": "56dfe2478cae35ded335261c854bb8b2a5e7f4d2", + "rev": "9624dc6d6b7b41e61decc968b04d4850fa50f670", "type": "gitlab" }, "original": { @@ -41,11 +41,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 543b4f2..a38ff3f 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ { devShells.default = pkgs.mkShell { packages = [ - inputs.ghc-wasm-meta.packages.${system}.all_9_10 + inputs.ghc-wasm-meta.packages.${system}.all_9_12 pkgs.dart-sass ]; };