diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7316ab22c9c28d86edf3fe3022c8c3e99523b9ba..7d19e229e6811afacbc4ac5740328b286e9914d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,14 +69,6 @@ build-armv7-linux-deb9: - docker - armv7-linux -build-i386-linux-deb8: - extends: .build - variables: - IMAGE: i386-linux-deb8 - tags: - - docker - - x86_64-linux - build-i386-linux-deb9: extends: .build variables: diff --git a/i386-linux-deb8/Dockerfile b/i386-linux-deb8/Dockerfile deleted file mode 100644 index 572c3170b14038dbf0a5260905b5c988f8c13e6f..0000000000000000000000000000000000000000 --- a/i386-linux-deb8/Dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -FROM i386/debian:jessie - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -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-key adv --keyserver keyserver.ubuntu.com --recv-keys F6F88286 - -# Core build utilities -RUN apt-get update -qq \ - && apt-get install --no-install-recommends -qy zlib1g-dev libtinfo-dev \ - libsqlite3-0 libsqlite3-dev \ - ca-certificates g++ git make automake autoconf gcc \ - perl python3 texinfo xz-utils lbzip2 bzip2 patch openssh-client sudo time \ - jq wget curl \ - # Documentation tools - python3-sphinx texlive-xetex texlive-latex-extra \ - # Core build utilities - libgmp-dev:i386 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -WORKDIR /tmp -# Get i386 GHC bindist for 32 bit CI builds. -ENV GHC_VERSION 8.6.5 -RUN curl https://downloads.haskell.org/~ghc/$GHC_VERSION/ghc-$GHC_VERSION-i386-deb8-linux.tar.xz | tar -Jx; -WORKDIR /tmp/ghc-$GHC_VERSION -RUN setarch i386 ./configure --prefix=/opt/ghc-i386/$GHC_VERSION CFLAGS=-m32 --target=i386-unknown-linux --build=i386-unknown-linux --host=i386-unknown-linux; \ - make install; \ - rm -rf /tmp/ghc-$GHC_VERSION -ENV PATH /opt/ghc-i386/$GHC_VERSION/bin:$PATH - -WORKDIR /tmp -# Get Cabal -ENV CABAL_VERSION 2.4.1.0 -RUN curl https://downloads.haskell.org/cabal/cabal-install-$CABAL_VERSION/cabal-install-$CABAL_VERSION-i386-unknown-linux.tar.xz | tar -Jx && \ - mv cabal /usr/local/bin/cabal - -# Create a normal user. -RUN adduser ghc --gecos "GHC builds" --disabled-password -RUN echo "ghc ALL = NOPASSWD : ALL" > /etc/sudoers.d/ghc -USER ghc -WORKDIR /home/ghc/ - -# Build Haskell tools -RUN cabal v2-update && \ - cabal v2-install hscolour happy alex --constraint 'happy ^>= 1.19.10' -ENV PATH /home/ghc/.cabal/bin:$PATH - -CMD ["bash"]