Skip to content

Commit 0b52dc4

Browse files
Add freeze file to avoid text 1.2.4.0 duplicate instances (#347)
* Add freeze file to avoid text 1.2.4.0 which conflicts with th-instances-lift (transitive dependencies) * Don't reset freeze file in travis build
1 parent a740f3d commit 0b52dc4

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,41 +118,42 @@ install:
118118
echo "repository hackage.haskell.org" >> $CABALHOME/config
119119
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
120120
- cat $CABALHOME/config
121-
- rm -fv cabal.project cabal.project.local cabal.project.freeze
121+
- rm -fv cabal.project cabal.project.local
122122
- travis_retry ${CABAL} v2-update -v
123123
- if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.6.5 happy) ; fi
124124
# Generate cabal.project
125-
- rm -rf cabal.project cabal.project.local cabal.project.freeze
125+
- rm -rf cabal.project cabal.project.local
126126
- touch cabal.project
127127
- |
128128
echo "packages: ." >> cabal.project
129129
- cat cabal.project || true
130130
- cat cabal.project.local || true
131131
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
132-
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
132+
# - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
133133
- ${CABAL} v2-configure $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
134134
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
135-
- rm cabal.project.freeze || true
136135
- rm cabal.project.local || true
137136
script:
138137
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
139138
# Packaging...
140139
- ${CABAL} v2-sdist all | color_cabal_output
141140
# Unpacking...
142141
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
142+
- cp cabal.project.freeze ${DISTDIR}/ || true
143143
- cd ${DISTDIR} || false
144144
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
145145
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
146146
- PKGDIR_reflex="$(find . -maxdepth 1 -type d -regex '.*/reflex-[0-9.]*')"
147147
# Generate cabal.project
148-
- rm -rf cabal.project cabal.project.local cabal.project.freeze
148+
- rm -rf cabal.project cabal.project.local
149149
- touch cabal.project
150150
- |
151151
echo "packages: ${PKGDIR_reflex}" >> cabal.project
152152
- |
153153
- cat cabal.project || true
154154
- cat cabal.project.local || true
155155
- rm cabal.project.local || true
156+
- cat cabal.project.freeze || true
156157
# Building...
157158
# this builds all libraries and executables (without tests/benchmarks)
158159
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output

cabal.project.freeze

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
constraints: any.text < 1.2.4.0

0 commit comments

Comments
 (0)