on master help sign in
Use git instead of circle ci's git implementation.

- Doing this sends proper branch information to coveralls.

commit58970a168555cdbeaaf2d1771957a0bf2f2e1433 authorPranay Sashank <pranaysashank@composewell.com> dateThu 21 Jan 2021, 15:25 (6 years ago) parentb10f17c
1 file changed+33−25
.circleci/config.yml+33−25
.circleci/config.yml+33−25
@@ -95,9 +95,16 @@ preinstall: &preinstall
9595 # required for packcheck
9696 apt-get install -y curl
9797
98+ # required for circleci.
99+ apt-get install -y libcurl4-gnutls-dev
100+ apt-get install -y git
101+ apt-get install -y libtinfo-dev
102+
98103 # required for outbound https for stack and for stack setup
99104 apt-get install -y netbase xz-utils make
100105
106+project-preinstall: &project-preinstall
107+ run: |
101108 # If a custom stack-yaml is specified, replace the default with that
102109 if test -e "$STACK_YAML"; then rm -f stack.yaml && ln -sv $STACK_YAML stack.yaml; else true; fi
103110 unset STACK_YAML
@@ -131,8 +138,9 @@ jobs:
131138 <<: *env
132139 executor: amd64-executor
133140 steps:
134− - checkout
135141 - *preinstall
142+ - checkout
143+ - *project-preinstall
136144 - *restore
137145 - run:
138146 name: GHC 8.8 + stack lts-16.12
@@ -150,8 +158,9 @@ jobs:
150158 <<: *env
151159 executor: amd64-executor
152160 steps:
153− - checkout
154161 - *preinstall
162+ - checkout
163+ - *project-preinstall
155164 - *restore
156165 - run: |
157166 apt-get install -y ghc-8.6.3
@@ -162,8 +171,9 @@ jobs:
162171 <<: *env
163172 executor: x86-executor
164173 steps:
165− - checkout
166174 - *preinstall
175+ - checkout
176+ - *project-preinstall
167177 - *restore
168178 - run:
169179 name: GHC 8.4.4 + x86 + debug
@@ -180,8 +190,9 @@ jobs:
180190 <<: *env
181191 executor: amd64-executor
182192 steps:
183− - checkout
184193 - *preinstall
194+ - checkout
195+ - *project-preinstall
185196 - *restore
186197 - run:
187198 environment:
@@ -201,8 +212,9 @@ jobs:
201212 <<: *env
202213 executor: amd64-executor
203214 steps:
204− - checkout
205215 - *preinstall
216+ - checkout
217+ - *project-preinstall
206218 - *restore
207219 - run:
208220 environment:
@@ -221,8 +233,9 @@ jobs:
221233 <<: *env
222234 executor: amd64-executor
223235 steps:
224− - checkout
225236 - *preinstall
237+ - checkout
238+ - *project-preinstall
226239 - *restore
227240 - run: |
228241 apt-get install -y ghc-7.10.3
@@ -233,8 +246,9 @@ jobs:
233246 <<: *env
234247 executor: amd64-executor
235248 steps:
236− - checkout
237249 - *preinstall
250+ - checkout
251+ - *project-preinstall
238252 - *restore
239253 - run: |
240254 bash -c "$PACKCHECK stack RESOLVER=lts-12"
@@ -243,8 +257,9 @@ jobs:
243257 <<: *env
244258 executor: amd64-executor
245259 steps:
246− - checkout
247260 - *preinstall
261+ - checkout
262+ - *project-preinstall
248263 - *restore
249264 - run: |
250265 bash -c "$PACKCHECK stack RESOLVER=lts-11"
@@ -253,8 +268,9 @@ jobs:
253268 <<: *env
254269 executor: amd64-executor
255270 steps:
256− - checkout
257271 - *preinstall
272+ - checkout
273+ - *project-preinstall
258274 - *restore
259275 - run:
260276 name: GHCJS 8.4+no-test+no-docs
@@ -279,8 +295,9 @@ jobs:
279295 <<: *env
280296 executor: amd64-executor
281297 steps:
282− - checkout
283298 - *preinstall
299+ - checkout
300+ - *project-preinstall
284301 - *restore
285302 - run:
286303 environment:
@@ -290,18 +307,15 @@ jobs:
290307 command: |
291308 apt-get install -y ghc-8.2.2
292309 apt-get install -y cabal-install-2.4
293− # required by hpc-coveralls
294− apt-get install -y libcurl4-gnutls-dev
295− apt-get install -y git
296− apt-get install libtinfo-dev
297310 bash -c "$PACKCHECK cabal-v1"
298311 - *save
299312 coveralls-ghc-8_8_3:
300313 <<: *env
301314 executor: amd64-executor
302315 steps:
303− - checkout
304316 - *preinstall
317+ - checkout
318+ - *project-preinstall
305319 - *restore
306320 - run:
307321 environment:
@@ -312,10 +326,6 @@ jobs:
312326 command: |
313327 apt-get install -y ghc-8.8.3
314328 apt-get install -y cabal-install-3.0
315− # required by hpc-coveralls
316− apt-get install -y libcurl4-gnutls-dev
317− apt-get install -y git
318− apt-get install libtinfo-dev
319329 bash -c "$PACKCHECK cabal-v2"
320330 no_output_timeout: 25m
321331 - *save
@@ -323,18 +333,15 @@ jobs:
323333 <<: *env
324334 executor: amd64-executor
325335 steps:
326− - checkout
327336 - *preinstall
337+ - checkout
338+ - *project-preinstall
328339 - *restore
329340 - run:
330341 name: Build and test with inspection, coverage, Werror
331342 command: |
332343 apt-get install -y ghc-8.10.2
333344 apt-get install -y cabal-install-3.2
334− # required by hpc-coveralls
335− apt-get install -y libcurl4-gnutls-dev
336− apt-get install -y git
337− apt-get install libtinfo-dev
338345 # Run tests with coverage
339346 cabal update
340347 cabal user-config update -a "jobs: 2"
@@ -350,8 +357,9 @@ jobs:
350357 <<: *env
351358 executor: amd64-executor
352359 steps:
353− - checkout
354360 - *preinstall
361+ - checkout
362+ - *project-preinstall
355363 - *restore
356364 - run:
357365 name: Hlint src