Skip to content

Commit

Permalink
Merge pull request #49 from blockfrost/srk/ci
Browse files Browse the repository at this point in the history
Update CI
  • Loading branch information
sorki committed Jan 16, 2024
2 parents 9aef2b1 + 5ef9d54 commit cebf4b6
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 56 deletions.
83 changes: 45 additions & 38 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,46 +1,53 @@
# Code generated by dhall-to-yaml. DO NOT EDIT.
jobs:
build:
runs-on: ubuntu-latest
name: "GHC ${{ matrix.ghc }}, Cabal ${{ matrix.cabal }}, OS ${{ matrix.os }}"
"runs-on": "${{ matrix.os }}"
steps:
- uses: "actions/checkout@v3"
- id: setup-haskell-cabal
uses: "haskell-actions/setup@v2"
with:
cabal-version: "${{ matrix.cabal }}"
enable-stack: false
ghc-version: "${{ matrix.ghc }}"
- name: Update Hackage repository
run: cabal update
- name: cabal.project.local.ci
run: |
if [ -e cabal.project.local.ci ]; then
cp cabal.project.local.ci cabal.project.local
fi
- name: freeze
run: cabal freeze --enable-tests --enable-benchmarks
- uses: "actions/cache@v3"
with:
key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}"
path: |
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
dist-newstyle
- name: Install dependencies
run: cabal build all --enable-tests --enable-benchmarks --only-dependencies
- name: build all
run: cabal build all --enable-tests --enable-benchmarks
- name: test all
run: cabal test all --enable-tests
- name: haddock all
run: cabal haddock all
- uses: "actions/checkout@v4"
with:
submodules: recursive
- id: "setup-haskell-cabal"
uses: "haskell-actions/setup@v2"
with:
"cabal-version": "${{ matrix.cabal }}"
"ghc-version": "${{ matrix.ghc }}"
- name: Update Hackage repository
run: cabal update
- name: cabal.project.local.ci
run: |
if [ -e cabal.project.local.ci ]; then
cp cabal.project.local.ci cabal.project.local
fi
- name: freeze
run: "cabal freeze --enable-tests --enable-benchmarks"
- uses: "actions/cache@v3"
with:
key: "${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.cabal}}-${{ hashFiles('cabal.project.freeze') }}"
path: |
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
dist-newstyle
- name: Install dependencies
run: "cabal build all --enable-tests --enable-benchmarks --only-dependencies"
- name: build all
run: "cabal build all --enable-tests --enable-benchmarks"
- name: test all
run: "cabal test all --enable-tests"
- name: haddock all
run: cabal haddock all
strategy:
matrix:
cabal:
- '3.10'
- '3.10'
ghc:
- '9.4.7'
- '9.0.2'
- '8.10.7'
- '9.6.3'
- '9.4.8'
- '9.2.8'
os:
- "ubuntu-latest"
name: Haskell CI
on:
- push
- pull_request
'on':
pull_request: {}
push: {}
schedule:
- cron: "4 20 10 * *"
4 changes: 3 additions & 1 deletion blockfrost-client/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Version [next](https://github.com/blockfrost/blockfrost-haskell/compare/client-0.8.0.0...master) (2024-mm-dd)
# Version [0.8.0.1](https://github.com/blockfrost/blockfrost-haskell/compare/client-0.8.0.0...client-0.8.0.1) (2024-01-16)

* GHC 9.6.3 compatibility

# Version [0.8.0.0](https://github.com/blockfrost/blockfrost-haskell/compare/client-0.7.1.1...client-0.8.0.0) (2023-12-18)

Expand Down
3 changes: 2 additions & 1 deletion blockfrost-client/src/Blockfrost/Client/IPFS.hs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ module Blockfrost.Client.IPFS
import Blockfrost.API
import Blockfrost.Client.Types
import Blockfrost.Types
import Control.Monad.Except
import Control.Monad.Except (MonadError, throwError)
import Control.Monad.IO.Class (liftIO)
import Data.ByteString.Lazy (ByteString)
import Data.Text (Text)
import qualified Data.Text
Expand Down
15 changes: 2 additions & 13 deletions ci.dhall
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
let haskellCi =
https://raw.githubusercontent.com/sorki/github-actions-dhall/pending/haskell-ci.dhall
https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall

in haskellCi.generalCi
haskellCi.matrixSteps
( Some
{ ghc =
[ haskellCi.GHC.GHC947
, haskellCi.GHC.GHC902
, haskellCi.GHC.GHC8107
]
, cabal = [ haskellCi.Cabal.Cabal310 ]
}
)
: haskellCi.CI.Type
in haskellCi.defaultCi3
6 changes: 3 additions & 3 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
set -eo pipefail
cd "$( dirname "${BASH_SOURCE[0]}" )"

echo "regenerating .github/workflows/ci.yaml..."
echo "regenerating .github/workflows/ci.yaml"

mkdir -p .github/workflows

# based on https://github.com/vmchale/github-actions-dhall
which dhall-to-yaml || cabal install dhall-yaml
dhall-to-yaml --file ci.dhall > .github/workflows/ci.yaml
dhall-to-yaml-ng --generated-comment --file ci.dhall > .github/workflows/ci.yaml

0 comments on commit cebf4b6

Please sign in to comment.