Skip to content

Commit 3291d0d

Browse files
committed
Use fedora 27 instead of centos 7
1 parent be6c702 commit 3291d0d

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

.gitlab-ci.yml

+10-16
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ workflow:
8585
- x86_64-linux
8686
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
8787

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+
8893
.x86_64-linux-alpine:
8994
tags:
9095
- x86_64-linux
@@ -304,34 +309,23 @@ test-x86_64-linux-fedora33:
304309
# x86_64 linux unknown
305310
######################
306311

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-
317312
build-x86_64-linux-unknown:
318313
extends:
319314
- .build
320-
- .x86_64-linux-centos7
315+
- .x86_64-linux-fedora27
321316
before_script: |
322317
echo "NAME=Linux" > ~/os-release.fake
323318
echo "ID=linux" >> ~/os-release.fake
324319
echo "PRETTY_NAME=Linux" >> ~/os-release.fake
325320
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
328322
variables:
329323
ADD_CABAL_ARGS: "--enable-split-sections"
330324

331325
tar-x86_64-linux-unknown:
332326
extends:
333327
- .artifacts
334-
- .x86_64-linux-centos7
328+
- .x86_64-linux-fedora27
335329
stage: tar
336330
needs: ["build-x86_64-linux-unknown"]
337331
before_script: |
@@ -348,14 +342,14 @@ tar-x86_64-linux-unknown:
348342
test-x86_64-linux-unknown:
349343
extends:
350344
- .test
351-
- .x86_64-linux-centos7
345+
- .x86_64-linux-fedora27
352346
needs: ["tar-x86_64-linux-unknown"]
353347
before_script: |
354348
echo "NAME=Linux" > ~/os-release.fake
355349
echo "ID=linux" >> ~/os-release.fake
356350
echo "PRETTY_NAME=Linux" >> ~/os-release.fake
357351
sudo ln -sf /home/ghc/os-release.fake /etc/os-release
358-
sudo yum install -y tree
352+
sudo dnf install -y tree
359353
360354
361355
######################

0 commit comments

Comments
 (0)