[commit: ghc] circleci-centos: CircleCI: Add configurations for Centos 7 and Debian 9 (7c2e8fd)
git at git.haskell.org
git at git.haskell.org
Sat Dec 8 18:22:09 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : circleci-centos
Link : http://ghc.haskell.org/trac/ghc/changeset/7c2e8fdd43448db90b8845c6255f7b42a2333cd2/ghc
>---------------------------------------------------------------
commit 7c2e8fdd43448db90b8845c6255f7b42a2333cd2
Author: Ben Gamari <ben at smart-cactus.org>
Date: Fri Dec 7 20:23:58 2018 -0500
CircleCI: Add configurations for Centos 7 and Debian 9
>---------------------------------------------------------------
7c2e8fdd43448db90b8845c6255f7b42a2333cd2
.circleci/config.yml | 79 +++++++++++++++-------
.../{i386-linux => i386-linux-deb8}/Dockerfile | 0
.../{x86_64-linux => x86_64-linux-deb8}/Dockerfile | 0
.../{x86_64-linux => x86_64-linux-deb9}/Dockerfile | 6 +-
.../Dockerfile | 0
.gitlab-ci.yml | 6 +-
6 files changed, 61 insertions(+), 30 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index eaac945..5f9a631 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,10 +108,10 @@ aliases:
only: /^ghc-.*/
jobs:
- "validate-x86_64-linux":
+ "validate-x86_64-linux-deb8":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.8
+ - image: ghcci/x86_64-linux-deb8:0.1
environment:
<<: *buildenv
GHC_COLLECTOR_FLAVOR: x86_64-linux
@@ -182,10 +182,33 @@ jobs:
- *store_test_artifacts
- *push_perf_note
- "validate-hadrian-x86_64-linux":
+ "validate-x86_64-linux-deb9":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.8
+ - image: ghcci/x86_64-linux-deb9:0.1
+ environment:
+ <<: *buildenv
+ GHC_COLLECTOR_FLAVOR: x86_64-linux
+ TEST_ENV: x86_64-linux
+ steps:
+ - checkout
+ - *set_git_identity
+ - *prepare
+ - *submodules
+ - *boot
+ - *configure_unix
+ - *make
+ - *bindist
+ - *store_bindist
+ - *test
+ - *store_test_results
+ - *store_test_artifacts
+ - *push_perf_note
+
+ "validate-hadrian-x86_64-linux-deb8":
+ resource_class: xlarge
+ docker:
+ - image: ghcci/x86_64-linux-deb8:0.1
environment:
<<: *buildenv
steps:
@@ -197,10 +220,10 @@ jobs:
- *configure_unix
- *build_hadrian
- "validate-x86_64-linux-unreg":
+ "validate-x86_64-linux-deb8-unreg":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.8
+ - image: ghcci/x86_64-linux-deb8:0.1
environment:
<<: *buildenv
TEST_ENV: x86_64-linux-unreg
@@ -217,10 +240,10 @@ jobs:
- *push_perf_note
- *store_test_artifacts
- "validate-x86_64-linux-llvm":
+ "validate-x86_64-linux-deb8-llvm":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.8
+ - image: ghcci/x86_64-linux-deb8:0.1
environment:
<<: *buildenv
BUILD_FLAVOUR: perf-llvm
@@ -247,10 +270,10 @@ jobs:
- *push_perf_note
# Nightly build with -DDEBUG using devel2 flavour
- "validate-x86_64-linux-debug":
+ "validate-x86_64-linux-deb8-debug":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.8
+ - image: ghcci/x86_64-linux-deb8:0.1
environment:
BUILD_FLAVOUR: devel2
<<: *buildenv
@@ -269,10 +292,10 @@ jobs:
- *store_test_artifacts
- *push_perf_note
- "validate-i386-linux":
+ "validate-i386-linux-deb8":
resource_class: xlarge
docker:
- - image: ghcci/i386-linux:0.0.7
+ - image: ghcci/i386-linux-deb8:0.1
environment:
<<: *buildenv
GHC_COLLECTOR_FLAVOR: i386-linux
@@ -292,10 +315,10 @@ jobs:
- *store_test_artifacts
- *push_perf_note
- "validate-x86_64-fedora":
+ "validate-x86_64-fedora27":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux-fedora:0.0.17
+ - image: ghcci/x86_64-linux-fedora27:0.1
environment:
<<: *buildenv
GHC_COLLECTOR_FLAVOR: x86_64-fedora
@@ -315,10 +338,10 @@ jobs:
- *store_test_artifacts
- *push_perf_note
- "slow-validate-x86_64-linux":
+ "slow-validate-x86_64-linux-deb8":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.8
+ - image: ghcci/x86_64-linux-deb8:0.1
environment:
<<: *buildenv
GHC_COLLECTOR_FLAVOR: x86_64-linux
@@ -338,17 +361,23 @@ workflows:
version: 2
validate:
jobs:
- - validate-x86_64-linux:
+ - validate-x86_64-linux-deb8:
*trigger_on_tags
# FreeBSD disabled: https://github.com/haskell/unix/issues/102
# - validate-x86_64-freebsd
- validate-x86_64-darwin:
*trigger_on_tags
- - validate-x86_64-linux-llvm
- - validate-i386-linux:
+ - validate-x86_64-linux-deb8-llvm
+ - validate-i386-linux-deb8:
+ *trigger_on_tags
+ - validate-x86_64-linux-deb9:
+ *trigger_on_tags
+ - validate-i386-linux-deb9:
+ *trigger_on_tags
+ - validate-x86_64-linux-centos7:
*trigger_on_tags
- - validate-hadrian-x86_64-linux
- - validate-x86_64-fedora:
+ - validate-hadrian-x86_64-linux-deb8
+ - validate-x86_64-fedora27:
*trigger_on_tags
nightly:
@@ -360,10 +389,10 @@ workflows:
only:
- master
jobs:
- - validate-x86_64-linux-unreg
- - validate-x86_64-linux-llvm
- - validate-x86_64-linux-debug
- - slow-validate-x86_64-linux
+ - validate-x86_64-linux-deb8-unreg
+ - validate-x86_64-linux-deb8-llvm
+ - validate-x86_64-linux-deb8-debug
+ - slow-validate-x86_64-linux-deb8
notify:
webhooks:
diff --git a/.circleci/images/i386-linux/Dockerfile b/.circleci/images/i386-linux-deb8/Dockerfile
similarity index 100%
rename from .circleci/images/i386-linux/Dockerfile
rename to .circleci/images/i386-linux-deb8/Dockerfile
diff --git a/.circleci/images/x86_64-linux/Dockerfile b/.circleci/images/x86_64-linux-deb8/Dockerfile
similarity index 100%
copy from .circleci/images/x86_64-linux/Dockerfile
copy to .circleci/images/x86_64-linux-deb8/Dockerfile
diff --git a/.circleci/images/x86_64-linux/Dockerfile b/.circleci/images/x86_64-linux-deb9/Dockerfile
similarity index 87%
rename from .circleci/images/x86_64-linux/Dockerfile
rename to .circleci/images/x86_64-linux-deb9/Dockerfile
index 0491ad9..6d14daa 100644
--- a/.circleci/images/x86_64-linux/Dockerfile
+++ b/.circleci/images/x86_64-linux-deb9/Dockerfile
@@ -1,8 +1,10 @@
-FROM debian:jessie
+FROM debian:stretch
ENV LANG C.UTF-8
-RUN echo 'deb http://ppa.launchpad.net/hvr/ghc/ubuntu trusty main' > /etc/apt/sources.list.d/ghc.list
+RUN apt-get update -qq; apt-get install -qy gnupg
+
+RUN echo 'deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main' > /etc/apt/sources.list.d/ghc.list
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F6F88286
RUN apt-get update -qq
diff --git a/.circleci/images/x86_64-linux-fedora/Dockerfile b/.circleci/images/x86_64-linux-fedora27/Dockerfile
similarity index 100%
rename from .circleci/images/x86_64-linux-fedora/Dockerfile
rename to .circleci/images/x86_64-linux-fedora27/Dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f669788..b0cf24d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ before_script:
key: hadrian
paths:
- cabal-cache
- image: ghcci/x86_64-linux:0.0.8
+ image: ghcci/x86_64-linux-deb8:0.1
.validate-x86_64-linux-hadrian:
extends: .validate-hadrian
@@ -50,7 +50,7 @@ before_script:
- |
THREADS=`mk/detect-cpu-count.sh`
make test THREADS=$THREADS JUNIT_FILE=../../junit.xml
- image: ghcci/x86_64-linux:0.0.8
+ image: ghcci/x86_64-linux-deb8:0.1
artifacts:
when: always
reports:
@@ -142,7 +142,7 @@ validate-x86_64-linux:
############################################################
.circleci:
- image: ghcci/x86_64-linux:0.0.8
+ image: ghcci/x86_64-linux-deb8:0.1
artifacts:
when: always
reports:
More information about the ghc-commits
mailing list