Skip to content

Commit 526be61

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 177ee1b + 46275c4 commit 526be61

File tree

8 files changed

+59
-1084
lines changed

8 files changed

+59
-1084
lines changed

.github/workflows/ci.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: CI tests
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
linux:
7+
8+
runs-on: ubuntu-latest
9+
strategy:
10+
fail-fast: true
11+
matrix:
12+
versions:
13+
- ghc: '8.10'
14+
cabal: '3.2'
15+
- ghc: '9.0'
16+
cabal: '3.4'
17+
- ghc: '9.2'
18+
cabal: '3.6'
19+
- ghc: '9.4'
20+
cabal: 'latest'
21+
- ghc: '9.6'
22+
cabal: 'latest'
23+
steps:
24+
- uses: actions/checkout@v1
25+
- name: Install cabal/ghc
26+
run: |
27+
ghcup install ghc --set ${{ matrix.versions.ghc }}
28+
ghcup install cabal --set ${{ matrix.versions.cabal }}
29+
30+
- name: Cache cabal global package db
31+
id: cabal-global
32+
uses: actions/cache@v3
33+
with:
34+
path: |
35+
~/.cabal
36+
key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ secrets.CACHE_VERSION }}
37+
38+
- name: Update
39+
run: |
40+
cabal v2-update
41+
- name: Build
42+
run: |
43+
cabal v2-build --enable-tests --disable-optimization -fexecutable
44+
- name: Test
45+
run: |
46+
cabal v2-test --disable-optimization
47+

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
dist
22
cabal-dev
3+
cabal.project.local
34
*.o
45
*.hi
56
*.chi

Makefile

+1-7
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ install:
1616
clean:
1717
cabal clean
1818

19-
bench:
20-
cabal configure --enable-benchmarks && \
21-
cabal install --only-dependencies && \
22-
cabal build && \
23-
cabal bench
24-
2519
update-c-sources: $(C_SOURCES)
2620

2721
cbits/config.h: $(CMARK_DIR)/build/src/config.h
@@ -39,4 +33,4 @@ cbits/%: $(CMARK_DIR)/src/%
3933
cbits/%: $(CMARK_DIR)/extensions/%
4034
cp $< $@
4135

42-
.PHONY: build prep install test clean bench update-c-sources
36+
.PHONY: build prep install test clean update-c-sources

bench/bench-cmark.hs

-36
This file was deleted.

0 commit comments

Comments
 (0)