Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,31 @@ 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
key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }}

- name: Cache cabal work
id: cabal-local
uses: actions/cache@v2
uses: actions/cache@v5
with:
path: |
dist-newstyle
Expand All @@ -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
8 changes: 8 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion codeworld-compiler/test/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ compilerOutput testName =
ErrorCheck
("test/testcases" </> testName </> "source.hs")
(magicModuleFinder testName dir)
Nothing
(ExtraExtensions [] [])
(dir </> "output.txt")
buildMode
False
Expand Down
Loading