Skip to content

Commit

Permalink
Fix dependency solving
Browse files Browse the repository at this point in the history
  • Loading branch information
Kleidukos committed Aug 19, 2024
1 parent a3328b1 commit 1bfd3f2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 15 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
ubuntu-version: 'latest'
macos-version: 'latest'
version: 0.1.7.1
tests:
builds:
name: ${{ matrix.ghc }} on ${{ matrix.os }}
needs: generate-matrix
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -62,15 +62,6 @@ jobs:
mkdir distribution
cp ${bin} distribution/print-api
- name: Test
run: cabal test --project-file=cabal.release.project --test-options "--xml=report.xml" all

- name: Publish Test Report
uses: mikepenz/action-junit-report@v4
if: success() || failure() # always run even if the previous step fails
with:
report_paths: "report.xml"

- name: File type
run: file distribution/print-api

Expand Down Expand Up @@ -168,7 +159,7 @@ jobs:
prerelease-head:
name: Create a GitHub prerelease with the binary artifacts
runs-on: ubuntu-latest
needs: ['tests', 'build-alpine']
needs: ['builds', 'build-alpine']

steps:
- uses: actions/download-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ deps: ## Install the dependencies of the backend
@cabal build --only-dependencies

build: ## Build the project in fast mode
@cabal build
@cabal build -j

clean: ## Remove compilation artifacts
@cabal clean
Expand All @@ -11,7 +11,7 @@ repl: ## Start a REPL
@cabal repl

test: ## Run the test suite
@cabal test
@cabal test -j

lint: ## Run the code linter (HLint)
@find app src compat -name "*.hs" | xargs -P $(PROCS) -I {} hlint --refactor-options="-i" --refactor {}
Expand Down
15 changes: 14 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,20 @@ packages: ./

tests: True

allow-newer: tasty-test-reporter:mtl, tasty-test-reporter:ansi-terminal, tasty-test-reporter:text, tasty-test-reporter:tasty
allow-newer:
tasty-test-reporter:mtl
, tasty-test-reporter:ansi-terminal
, tasty-test-reporter:text
, tasty-test-reporter:tasty
, tasty-test-reporter:containers
, tasty-test-reporter:filepath
, tasty-test-reporter:base

allow-newer:
, tasty-coverage:text
, tasty-coverage:containers
, tasty-coverage:filepath
, tasty-coverage:base

source-repository-package
type: git
Expand Down
2 changes: 1 addition & 1 deletion test/IgnoreList.hs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ generateServantClientAPIWithIgnoreList = do
assertExitSuccess "`cabal exec -v0 -- ghc --print-libdir`" exitCode
assertExitSuccess "Fetch the archive of servant-client" =<< Process.runProcess (Process.shell "cabal get servant-client-0.20 --destdir=../")
liftIO $ Directory.setCurrentDirectory "../servant-client-0.20"
let buildServantClient = Process.shell "cabal build --write-ghc-environment-files=always"
let buildServantClient = Process.shell "cabal build --allow-newer --write-ghc-environment-files=always"
assertExitSuccess "Build servant-client" =<< Process.runProcess buildServantClient
ignoreListPath <- liftIO $ OsPath.makeAbsolute [osp|../print-api/test/golden/servant-client-ignore-list.txt|]
ignoreListFilePath <- liftIO $ OsPath.decodeUtf ignoreListPath
Expand Down

0 comments on commit 1bfd3f2

Please sign in to comment.