From ef4951eebefbadfa76ef78a9a2d9d56da6571298 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 12 Jan 2022 14:13:56 +0800 Subject: [PATCH 1/3] update stack to lts-18 --- stack.yaml | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/stack.yaml b/stack.yaml index d952919..1b9f346 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-17.4 +resolver: lts-18.21 packages: - . @@ -10,31 +10,24 @@ flags: # with-pg: True extra-deps: - - streaming-utils-0.2.0.0 - - json-stream-0.4.2.4 - - HDBC-postgresql-2.3.2.7 - - hasql-th-0.4.0.8 - - headed-megaparsec-0.2 - - selective-0.4.1 - - template-haskell-compat-v0208-0.1.5 - - hasql-transaction-1.0.0.1 - - opaleye-0.7.0.0 - - product-profunctors-0.11.0.0 - - streaming-bytestring-0.1.7 - - random-1.2.0 - - splitmix-0.1.0.3 - - blaze-colonnade-1.2.2.1 - - colonnade-1.2.0.2 - Chart-diagrams-1.9.3 + - HDBC-postgresql-2.4.0.0 - SVGFonts-1.7.0.1 - - diagrams-core-1.4.2 - - diagrams-lib-1.4.3 + - active-0.2.0.15 + - blaze-colonnade-1.2.2.1 + - colonnade-1.2.0.2 + - diagrams-core-1.5.0 + - diagrams-lib-1.4.5.1 - diagrams-postscript-1.5 - - diagrams-svg-1.4.3 - - svg-builder-0.1.1 - - active-0.2.0.14 - - dual-tree-0.2.2.1 - - monoid-extras-0.5.1 + - diagrams-svg-1.4.3.1 + - dual-tree-0.2.3.0 + - fast-builder-0.1.3.0 + - hasql-th-0.4.0.10 + - headed-megaparsec-0.2.0.2 + - json-stream-0.4.2.4 + - monoid-extras-0.6.1 + - postgresql-syntax-0.4 - statestack-0.3 - - fast-builder-0.1.2.1 - - postgresql-syntax-0.3.0.3 + - streaming-utils-0.2.1.0 + - svg-builder-0.1.1 + - template-haskell-compat-v0208-0.1.5 From 49f7b3ea894ba0f123ca49b81e93e0fb79916668 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 12 Jan 2022 15:34:11 +0800 Subject: [PATCH 2/3] allow fin-0.2 --- hid-examples.cabal | 2 +- package.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hid-examples.cabal b/hid-examples.cabal index ae266b6..6c4328e 100644 --- a/hid-examples.cabal +++ b/hid-examples.cabal @@ -498,7 +498,7 @@ executable elevator build-depends: base >=4.12 && <4.15 , dec >=0.0.3 && <0.1 - , fin >=0.1 && <0.2 + , fin >=0.1 && <0.3 , mtl >=2.0 && <2.3 , singletons >=2.5 && <2.8 default-language: Haskell2010 diff --git a/package.yaml b/package.yaml index ff45956..57c549b 100644 --- a/package.yaml +++ b/package.yaml @@ -523,7 +523,7 @@ executables: - Elevator.Safe.Operations - Elevator.Safe.Moves dependencies: - - fin >= 0.1 && < 0.2 + - fin >= 0.1 && < 0.3 - dec >= 0.0.3 && < 0.1 - singletons >= 2.5 && < 2.8 - mtl >=2.0 && <2.3 From 63c0364c4322642411c7d7579722757e1ab24a09 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 12 Jan 2022 15:38:49 +0800 Subject: [PATCH 3/3] add github workflow build action --- .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..c64b1d2 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,31 @@ +name: build +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + ghc: ['8.10', '8.8', '8.6'] + name: Haskell GHC ${{ matrix.ghc }} + steps: + - uses: actions/checkout@v2 + - uses: haskell/actions/setup@v1 + with: + ghc-version: ${{ matrix.ghc }} + - uses: actions/cache@v2 + with: + path: | + ~/.cabal + dist-newstyle + key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('**/*.cabal','**/cabal.project') }} + restore-keys: | + ${{ runner.os }}-${{ matrix.ghc }}- + ${{ runner.os }}- + - run: cabal update + - run: cabal build + - run: cabal test + - run: cabal bench