summaryrefslogtreecommitdiff
path: root/.circleci
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2018-11-23 19:20:00 -0500
committerBen Gamari <ben@smart-cactus.org>2018-12-01 08:57:37 -0500
commitb6108395cb969f79332d4bc31a3996607b9e0c16 (patch)
treea0703490f3907ede88189d65de8e14adc5945fb9 /.circleci
parentcbf57b7dbfdbfa72475d793b27858cacf2ed9816 (diff)
downloadhaskell-b6108395cb969f79332d4bc31a3996607b9e0c16.tar.gz
Add GitLab CI
Diffstat (limited to '.circleci')
-rw-r--r--.circleci/config.yml16
-rw-r--r--.circleci/images/i386-linux/Dockerfile5
-rw-r--r--.circleci/images/x86_64-freebsd/Dockerfile1
-rw-r--r--.circleci/images/x86_64-linux-fedora/Dockerfile5
-rw-r--r--.circleci/images/x86_64-linux/Dockerfile5
5 files changed, 18 insertions, 14 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4b8d7a4e96..68ab2c463d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -111,7 +111,7 @@ jobs:
"validate-x86_64-linux":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.7
+ - image: ghcci/x86_64-linux:0.0.8
environment:
<<: *buildenv
GHC_COLLECTOR_FLAVOR: x86_64-linux
@@ -185,7 +185,7 @@ jobs:
"validate-hadrian-x86_64-linux":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.7
+ - image: ghcci/x86_64-linux:0.0.8
environment:
<<: *buildenv
steps:
@@ -200,7 +200,7 @@ jobs:
"validate-x86_64-linux-unreg":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.7
+ - image: ghcci/x86_64-linux:0.0.8
environment:
<<: *buildenv
TEST_ENV: x86_64-linux-unreg
@@ -220,7 +220,7 @@ jobs:
"validate-x86_64-linux-llvm":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.7
+ - image: ghcci/x86_64-linux:0.0.8
environment:
<<: *buildenv
BUILD_FLAVOUR: perf-llvm
@@ -250,7 +250,7 @@ jobs:
"validate-x86_64-linux-debug":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.7
+ - image: ghcci/x86_64-linux:0.0.8
environment:
BUILD_FLAVOUR: devel2
<<: *buildenv
@@ -272,7 +272,7 @@ jobs:
"validate-i386-linux":
resource_class: xlarge
docker:
- - image: ghcci/i386-linux:0.0.6
+ - image: ghcci/i386-linux:0.0.7
environment:
<<: *buildenv
GHC_COLLECTOR_FLAVOR: i386-linux
@@ -295,7 +295,7 @@ jobs:
"validate-x86_64-fedora":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux-fedora:0.0.16
+ - image: ghcci/x86_64-linux-fedora:0.0.17
environment:
<<: *buildenv
GHC_COLLECTOR_FLAVOR: x86_64-fedora
@@ -318,7 +318,7 @@ jobs:
"slow-validate-x86_64-linux":
resource_class: xlarge
docker:
- - image: ghcci/x86_64-linux:0.0.7
+ - image: ghcci/x86_64-linux:0.0.8
environment:
<<: *buildenv
GHC_COLLECTOR_FLAVOR: x86_64-linux
diff --git a/.circleci/images/i386-linux/Dockerfile b/.circleci/images/i386-linux/Dockerfile
index 47d19cc05b..c8e51810c2 100644
--- a/.circleci/images/i386-linux/Dockerfile
+++ b/.circleci/images/i386-linux/Dockerfile
@@ -8,8 +8,9 @@ RUN apt-get update -qq
# Core build utilities
RUN apt-get install -qy zlib1g-dev libtinfo-dev libsqlite3-0 libsqlite3-dev \
- ca-certificates g++ git curl make automake autoconf gcc \
- perl python3 texinfo xz-utils lbzip2 patch openssh-client sudo
+ ca-certificates g++ git make automake autoconf gcc \
+ perl python3 texinfo xz-utils lbzip2 patch openssh-client sudo \
+ jq wget curl
# Documentation tools
RUN apt-get install -qy python3-sphinx texlive-xetex texlive-latex-extra
diff --git a/.circleci/images/x86_64-freebsd/Dockerfile b/.circleci/images/x86_64-freebsd/Dockerfile
index 9c51cc021c..1098d7a9ac 100644
--- a/.circleci/images/x86_64-freebsd/Dockerfile
+++ b/.circleci/images/x86_64-freebsd/Dockerfile
@@ -18,6 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
software-properties-common \
sudo \
wget \
+ jq \
xz-utils
COPY build-toolchain.sh /tmp/
diff --git a/.circleci/images/x86_64-linux-fedora/Dockerfile b/.circleci/images/x86_64-linux-fedora/Dockerfile
index 0ed546ca35..6fad77f1c5 100644
--- a/.circleci/images/x86_64-linux-fedora/Dockerfile
+++ b/.circleci/images/x86_64-linux-fedora/Dockerfile
@@ -5,8 +5,9 @@ ENV LANG C.UTF-8
# Core build utilities
RUN dnf -y install coreutils binutils which git make \
automake autoconf gcc perl python3 texinfo xz lbzip2 \
- patch openssh-clients sudo curl zlib-devel sqlite \
- ncurses-compat-libs gmp-devel ncurses-devel gcc-c++ findutils
+ patch openssh-clients sudo zlib-devel sqlite \
+ ncurses-compat-libs gmp-devel ncurses-devel gcc-c++ findutils \
+ curl wget jq
# Documentation tools
RUN dnf -y install python3-sphinx \
diff --git a/.circleci/images/x86_64-linux/Dockerfile b/.circleci/images/x86_64-linux/Dockerfile
index 5360645802..0491ad9bba 100644
--- a/.circleci/images/x86_64-linux/Dockerfile
+++ b/.circleci/images/x86_64-linux/Dockerfile
@@ -8,8 +8,9 @@ RUN apt-get update -qq
# Core build utilities
RUN apt-get install -qy zlib1g-dev libtinfo-dev libsqlite3-0 libsqlite3-dev \
- ca-certificates g++ git curl make automake autoconf gcc \
- perl python3 texinfo xz-utils lbzip2 patch openssh-client sudo
+ ca-certificates g++ git make automake autoconf gcc \
+ perl python3 texinfo xz-utils lbzip2 patch openssh-client sudo \
+ jq wget curl
# Documentation tools
RUN apt-get install -qy python3-sphinx texlive-xetex texlive-latex-extra