From a4eb5234995a9b8da5186fc170b12eab92eb96dd Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Mon, 20 Apr 2026 13:47:30 +0200 Subject: [PATCH 01/10] update action versions --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 258fc871..90ca713c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,12 +20,12 @@ jobs: - ghc: '8.6.5' cabal: '3.4' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 # need to install older cabal/ghc versions from ppa repository - name: Install recent cabal/ghc - uses: haskell/actions/setup@v1 + uses: haskell/actions/setup@v2 with: ghc-version: ${{ matrix.versions.ghc }} cabal-version: ${{ matrix.versions.cabal }} @@ -36,7 +36,7 @@ jobs: - name: Cache cabal global package db id: cabal-global - uses: actions/cache@v2 + uses: actions/cache@v5 with: path: | ~/.cabal @@ -44,7 +44,7 @@ jobs: - name: Cache cabal work id: cabal-local - uses: actions/cache@v2 + uses: actions/cache@v5 with: path: | dist-newstyle From 0c1d20f7da937bb129dc55468c0a9d1aeea3b243 Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Mon, 20 Apr 2026 13:52:03 +0200 Subject: [PATCH 02/10] update haskell action's path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90ca713c..75cdc048 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: # need to install older cabal/ghc versions from ppa repository - name: Install recent cabal/ghc - uses: haskell/actions/setup@v2 + uses: haskell-actions/setup@v2 with: ghc-version: ${{ matrix.versions.ghc }} cabal-version: ${{ matrix.versions.cabal }} From c7866d3b74a8843ca6f2c99e2c154b43be0d87b0 Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Mon, 20 Apr 2026 14:53:21 +0200 Subject: [PATCH 03/10] add cabal.project file for test build --- cabal.project | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 cabal.project diff --git a/cabal.project b/cabal.project new file mode 100644 index 00000000..b7768415 --- /dev/null +++ b/cabal.project @@ -0,0 +1,8 @@ +packages: */*.cabal + +source-repository-package + type: git + location: https://github.com/fmidue/ghcjs-base-stub.git + tag: e19317673d68c2be874fca4661d1ce16b2dc20a1 + +with-compiler: ghc-8.6.5 From f751a3a55b402ec258f319a4988a46017be663fb Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Mon, 20 Apr 2026 14:58:05 +0200 Subject: [PATCH 04/10] check if this works with old action --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75cdc048..90ca713c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: # need to install older cabal/ghc versions from ppa repository - name: Install recent cabal/ghc - uses: haskell-actions/setup@v2 + uses: haskell/actions/setup@v2 with: ghc-version: ${{ matrix.versions.ghc }} cabal-version: ${{ matrix.versions.cabal }} From 3d3986f40b5abf612d9adbb406fe7aca0cf3120f Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Mon, 20 Apr 2026 15:02:20 +0200 Subject: [PATCH 05/10] use same cabal version as in docker build --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90ca713c..bf25f894 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,14 +18,14 @@ jobs: matrix: versions: - ghc: '8.6.5' - cabal: '3.4' + cabal: '2.4.1.0' steps: - uses: actions/checkout@v6 # need to install older cabal/ghc versions from ppa repository - name: Install recent cabal/ghc - uses: haskell/actions/setup@v2 + uses: haskell-actions/setup@v2 with: ghc-version: ${{ matrix.versions.ghc }} cabal-version: ${{ matrix.versions.cabal }} From 528936b77e06191db3c407362b5cdbdc8fbd1e26 Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Mon, 20 Apr 2026 15:32:20 +0200 Subject: [PATCH 06/10] use newer, but not deprecated cabal version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf25f894..32ae00fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: matrix: versions: - ghc: '8.6.5' - cabal: '2.4.1.0' + cabal: '3.14.2.0' steps: - uses: actions/checkout@v6 From 361cbf3a8274c875a900d1ba7caa8406511a209e Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Mon, 20 Apr 2026 15:55:54 +0200 Subject: [PATCH 07/10] remove build output redirection --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32ae00fb..d55c43da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: cabal build all --dependencies-only --enable-tests --disable-optimization - name: Build run: | - cabal build all --enable-tests --disable-optimization 2>&1 | tee build.log + cabal build all --enable-tests --disable-optimization # - name: Test # needs GHCJS # run: | # cabal test all --disable-optimization From d338f65b6bf9c4c6acc951dcb175b77cff2a9efb Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Mon, 20 Apr 2026 15:58:41 +0200 Subject: [PATCH 08/10] fix type mismatch in test case --- codeworld-compiler/test/Main.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codeworld-compiler/test/Main.hs b/codeworld-compiler/test/Main.hs index 1e52c5ff..cd4d3eb5 100644 --- a/codeworld-compiler/test/Main.hs +++ b/codeworld-compiler/test/Main.hs @@ -43,7 +43,7 @@ compilerOutput testName = ErrorCheck ("test/testcases" testName "source.hs") (magicModuleFinder testName dir) - Nothing + (ExtraExtensions [] []) (dir "output.txt") buildMode False From 06475fca8d599959715e47b6cc4dfcd704307bd3 Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Mon, 20 Apr 2026 16:02:23 +0200 Subject: [PATCH 09/10] remove comment referencing resolved issue --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d55c43da..bd8143d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,8 +31,6 @@ jobs: cabal-version: ${{ matrix.versions.cabal }} # declare/restore cached things - # caching doesn't work for scheduled runs yet - # https://github.com/actions/cache/issues/63 - name: Cache cabal global package db id: cabal-global From 4d9da0569b19fd4566bd96aa7110dcc43eacf9ce Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Mon, 20 Apr 2026 16:03:04 +0200 Subject: [PATCH 10/10] update workflow step name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd8143d8..6a5e9189 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: # need to install older cabal/ghc versions from ppa repository - - name: Install recent cabal/ghc + - name: Install production GHC and recent cabal uses: haskell-actions/setup@v2 with: ghc-version: ${{ matrix.versions.ghc }}