Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
kivikakk committed Jul 8, 2024
2 parents 177ee1b + 46275c4 commit 526be61
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 1,084 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: CI tests

on: [push, pull_request]

jobs:
linux:

runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
versions:
- ghc: '8.10'
cabal: '3.2'
- ghc: '9.0'
cabal: '3.4'
- ghc: '9.2'
cabal: '3.6'
- ghc: '9.4'
cabal: 'latest'
- ghc: '9.6'
cabal: 'latest'
steps:
- uses: actions/checkout@v1
- name: Install cabal/ghc
run: |
ghcup install ghc --set ${{ matrix.versions.ghc }}
ghcup install cabal --set ${{ matrix.versions.cabal }}
- name: Cache cabal global package db
id: cabal-global
uses: actions/cache@v3
with:
path: |
~/.cabal
key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ secrets.CACHE_VERSION }}

- name: Update
run: |
cabal v2-update
- name: Build
run: |
cabal v2-build --enable-tests --disable-optimization -fexecutable
- name: Test
run: |
cabal v2-test --disable-optimization
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
dist
cabal-dev
cabal.project.local
*.o
*.hi
*.chi
Expand Down
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ install:
clean:
cabal clean

bench:
cabal configure --enable-benchmarks && \
cabal install --only-dependencies && \
cabal build && \
cabal bench

update-c-sources: $(C_SOURCES)

cbits/config.h: $(CMARK_DIR)/build/src/config.h
Expand All @@ -39,4 +33,4 @@ cbits/%: $(CMARK_DIR)/src/%
cbits/%: $(CMARK_DIR)/extensions/%
cp $< $@

.PHONY: build prep install test clean bench update-c-sources
.PHONY: build prep install test clean update-c-sources
36 changes: 0 additions & 36 deletions bench/bench-cmark.hs

This file was deleted.

Loading

0 comments on commit 526be61

Please sign in to comment.