Skip to content

Commit 57ad329

Browse files
authored
Remove cabal.project.freeze (#2450)
1 parent c35bfa5 commit 57ad329

File tree

5 files changed

+16
-194
lines changed

5 files changed

+16
-194
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ jobs:
5555
cabal:
5656
name: 'Cabal'
5757
runs-on: ubuntu-latest
58+
env:
59+
ghc_version: "8.10.4"
5860
steps:
5961
- name: Install prerequisites
6062
run: |
@@ -66,17 +68,17 @@ jobs:
6668
ref: ${{ github.event.pull_request.head.sha }}
6769
submodules: recursive
6870

69-
- uses: actions/setup-haskell@v1.1.4
71+
- uses: haskell/actions/setup@v1
7072
id: setup-haskell-cabal
7173
with:
72-
ghc-version: "8.10.1"
74+
ghc-version: ${{ env.ghc_version }}
7375
cabal-version: "3.2"
7476

7577
- name: Cache Cabal store
7678
uses: actions/cache@v2
7779
with:
7880
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
79-
key: ${{ runner.os }}-ghc-8.10.1-${{ hashFiles('cabal.project.freeze') }}
81+
key: ${{ runner.os }}-ghc-${{ env.ghc_version }}
8082

8183
- name: Build
8284
run: cabal v2-build --enable-tests --enable-benchmarks all
@@ -101,7 +103,7 @@ jobs:
101103
ref: ${{ github.event.pull_request.head.sha }}
102104
submodules: recursive
103105

104-
- uses: actions/setup-haskell@v1.1.4
106+
- uses: haskell/actions/setup@v1
105107
id: setup-haskell-stack
106108
with:
107109
enable-stack: true
@@ -117,7 +119,7 @@ jobs:
117119
uses: actions/cache@v2
118120
with:
119121
path: ${{ steps.locate-stack-root.outputs.stack-root }}
120-
key: ${{ runner.os }}-ghc-8.10.1-${{ hashFiles('stack.yaml.lock') }}
122+
key: ${{ runner.os }}-${{ hashFiles('stack.yaml.lock') }}
121123

122124
- name: Build dependencies
123125
run: |

cabal.project.freeze

Lines changed: 0 additions & 173 deletions
This file was deleted.

kore/kore.cabal

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cabal-version: 2.2
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: f665c212513ddd12eaa511bf198ce16f125dd902b5b25a656b2fa584d073c5ba
7+
-- hash: e1fb37a3896c7ce0fd031723af0b1589be0df0d9b5f958befbe74dbbfdee231f
88

99
name: kore
1010
version: 0.41.0.0
@@ -467,7 +467,7 @@ library
467467
, transformers >=0.4
468468
, unordered-containers >=0.2
469469
, vector >=0.12
470-
, witherable >=0.3
470+
, witherable >=0.3 && <0.4
471471
, zlib >=0.6
472472
if !flag(release)
473473
ghc-options: -fno-specialise
@@ -543,7 +543,7 @@ executable kore-exec
543543
, transformers >=0.4
544544
, unordered-containers >=0.2
545545
, vector >=0.12
546-
, witherable >=0.3
546+
, witherable >=0.3 && <0.4
547547
, zlib >=0.6
548548
if !flag(release)
549549
ghc-options: -fno-specialise
@@ -623,7 +623,7 @@ executable kore-format
623623
, transformers >=0.4
624624
, unordered-containers >=0.2
625625
, vector >=0.12
626-
, witherable >=0.3
626+
, witherable >=0.3 && <0.4
627627
, zlib >=0.6
628628
if !flag(release)
629629
ghc-options: -fno-specialise
@@ -703,7 +703,7 @@ executable kore-parser
703703
, transformers >=0.4
704704
, unordered-containers >=0.2
705705
, vector >=0.12
706-
, witherable >=0.3
706+
, witherable >=0.3 && <0.4
707707
, zlib >=0.6
708708
if !flag(release)
709709
ghc-options: -fno-specialise
@@ -781,7 +781,7 @@ executable kore-prof
781781
, transformers >=0.4
782782
, unordered-containers >=0.2
783783
, vector >=0.12
784-
, witherable >=0.3
784+
, witherable >=0.3 && <0.4
785785
, zlib >=0.6
786786
if !flag(release)
787787
ghc-options: -fno-specialise
@@ -857,7 +857,7 @@ executable kore-repl
857857
, transformers >=0.4
858858
, unordered-containers >=0.2
859859
, vector >=0.12
860-
, witherable >=0.3
860+
, witherable >=0.3 && <0.4
861861
, zlib >=0.6
862862
if !flag(release)
863863
ghc-options: -fno-specialise
@@ -1143,7 +1143,7 @@ test-suite kore-test
11431143
, transformers >=0.4
11441144
, unordered-containers >=0.2
11451145
, vector >=0.12
1146-
, witherable >=0.3
1146+
, witherable >=0.3 && <0.4
11471147
, zlib >=0.6
11481148
if !flag(release)
11491149
ghc-options: -fno-specialise

kore/package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ dependencies:
9090
- transformers >=0.4
9191
- unordered-containers >=0.2
9292
- vector >= 0.12
93-
- witherable >=0.3
93+
- witherable >=0.3 && <0.4 # witherable >=0.4 deprecates module Data.Witherable
9494
- zlib >= 0.6
9595

9696
build-tools:

scripts/cabal-freeze.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)