Skip to content

Commit 55ce0cb

Browse files
added cabal ci
1 parent cd5d053 commit 55ce0cb

File tree

3 files changed

+12
-25
lines changed

3 files changed

+12
-25
lines changed

.github/workflows/cabal.yml

Whitespace-only changes.

.github/workflows/haskell.yml renamed to .github/workflows/stack.yml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@ jobs:
3838
os: [ubuntu-latest, macOS-latest]
3939
# use this to specify what resolvers and ghc to use
4040
plan:
41-
- { build: stack, resolver: "--resolver lts-9" } # ghc-8.0.2
42-
- { build: stack, resolver: "--resolver lts-11" } # ghc-8.2.2
43-
- { build: stack, resolver: "--resolver lts-12" } # ghc-8.4.4
44-
# - { build: stack, resolver: "--resolver lts-13" } redundant because lts-14 checks ghc-8.6 already
45-
- { build: stack, resolver: "--resolver lts-14" } # ghc-8.6.5
46-
- { build: stack, resolver: "--resolver nightly" }
47-
- { build: stack, resolver: "" }
41+
- { resolver: "--resolver lts-9" } # ghc-8.0.2
42+
- { resolver: "--resolver lts-11" } # ghc-8.2.2
43+
- { resolver: "--resolver lts-12" } # ghc-8.4.4
44+
- { resolver: "--resolver lts-14" } # ghc-8.6.5
45+
- { resolver: "--resolver nightly" }
46+
- { resolver: "" }
4847
# use this to include any dependencies from OS package managers
4948
include: []
5049
# - os: macOS-latest
@@ -68,17 +67,9 @@ jobs:
6867
path: ~/.stack
6968
key: ${{ runner.os }}-stack-v1
7069

71-
- name: Cache Cabal
72-
id: cache-cabal
73-
uses: actions/cache@v1
74-
with:
75-
path: ~/.cabal
76-
key: ${{ runner.os }}-cabal-v1
77-
78-
- name: Build
79-
run: |
80-
stack build --ghc-options="-Werror" --only-dependencies
8170

82-
- name: Test
71+
- name: Build & Test
8372
run: |
84-
stack test --ghc-options="-Werror"
73+
stack --no-terminal $ARGS test --bench --no-run-benchmarks
74+
env:
75+
ARGS: ${{ matrix.plan.resolver }}

quickjs-hs.cabal

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 1.12
22
name: quickjs-hs
3-
version: 0.1.1
3+
version: 0.1
44
homepage: https://github.com/goodlyrottenapple/quickjs-hs#readme
55
bug-reports: https://github.com/goodlyrottenapple/quickjs-hs/issues
66
author: Sam Balco
@@ -52,13 +52,9 @@ library
5252
-- To make both `cabal repl` and `stack ghci` work, we have to
5353
-- make "a.cpp" come alphabetically before "main.cpp".
5454
c-sources:
55-
quickjs/cutils.h
56-
, quickjs/cutils.c
57-
, quickjs/libbf.h
55+
quickjs/cutils.c
5856
, quickjs/libbf.c
59-
, quickjs/libregexp.h
6057
, quickjs/libregexp.c
61-
, quickjs/libunicode.h
6258
, quickjs/libunicode.c
6359
, quickjs/quickjs.h
6460
, quickjs/quickjs.c

0 commit comments

Comments
 (0)