@@ -85,6 +85,11 @@ workflow:
85
85
- x86_64-linux
86
86
image : " registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
87
87
88
+ .x86_64-linux-fedora27 :
89
+ tags :
90
+ - x86_64-linux
91
+ image : " registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV"
92
+
88
93
.x86_64-linux-alpine :
89
94
tags :
90
95
- x86_64-linux
@@ -304,34 +309,23 @@ test-x86_64-linux-fedora33:
304
309
# x86_64 linux unknown
305
310
# #####################
306
311
307
- build-x86_64-linux-centos7 :
308
- extends :
309
- - .build
310
- - .x86_64-linux-centos7
311
- before_script :
312
- - sudo yum install -y epel-release
313
- - sudo yum install -y patchelf tree
314
- variables :
315
- ADD_CABAL_ARGS : " --enable-split-sections"
316
-
317
312
build-x86_64-linux-unknown :
318
313
extends :
319
314
- .build
320
- - .x86_64-linux-centos7
315
+ - .x86_64-linux-fedora27
321
316
before_script : |
322
317
echo "NAME=Linux" > ~/os-release.fake
323
318
echo "ID=linux" >> ~/os-release.fake
324
319
echo "PRETTY_NAME=Linux" >> ~/os-release.fake
325
320
sudo ln -sf /home/ghc/os-release.fake /etc/os-release
326
- sudo yum install -y epel-release
327
- sudo yum install -y patchelf tree
321
+ sudo dnf install -y patchelf tree
328
322
variables :
329
323
ADD_CABAL_ARGS : " --enable-split-sections"
330
324
331
325
tar-x86_64-linux-unknown :
332
326
extends :
333
327
- .artifacts
334
- - .x86_64-linux-centos7
328
+ - .x86_64-linux-fedora27
335
329
stage : tar
336
330
needs : ["build-x86_64-linux-unknown"]
337
331
before_script : |
@@ -348,14 +342,14 @@ tar-x86_64-linux-unknown:
348
342
test-x86_64-linux-unknown :
349
343
extends :
350
344
- .test
351
- - .x86_64-linux-centos7
345
+ - .x86_64-linux-fedora27
352
346
needs : ["tar-x86_64-linux-unknown"]
353
347
before_script : |
354
348
echo "NAME=Linux" > ~/os-release.fake
355
349
echo "ID=linux" >> ~/os-release.fake
356
350
echo "PRETTY_NAME=Linux" >> ~/os-release.fake
357
351
sudo ln -sf /home/ghc/os-release.fake /etc/os-release
358
- sudo yum install -y tree
352
+ sudo dnf install -y tree
359
353
360
354
361
355
# #####################
0 commit comments