diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 258fc871..6a5e9189 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,25 +18,23 @@ jobs: matrix: versions: - ghc: '8.6.5' - cabal: '3.4' + cabal: '3.14.2.0' 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 + - name: Install production GHC and recent cabal + uses: haskell-actions/setup@v2 with: ghc-version: ${{ matrix.versions.ghc }} 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 - uses: actions/cache@v2 + uses: actions/cache@v5 with: path: | ~/.cabal @@ -44,7 +42,7 @@ jobs: - name: Cache cabal work id: cabal-local - uses: actions/cache@v2 + uses: actions/cache@v5 with: path: | dist-newstyle @@ -56,7 +54,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 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 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