From 55c9f4da3cc4d520dd4d13dc0f883773a19e3480 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Tue, 17 Oct 2023 11:05:16 +0300 Subject: [PATCH] Expand alpine builds to include i386 Note the use of ghc-9.0.2 for i386-alpine. Resolves #9347 --- .gitlab-ci.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9718af9e77..4fdf3ed5204 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,16 +59,24 @@ build-linux: TARBALL_EXT: tar.xz ADD_CABAL_ARGS: "--enable-split-sections" -build-x86_64-linux-alpine: +build-linux-alpine: extends: .build + parallel: + matrix: + - ARCH: i386 + OS: [alpine3_12] + GHC_VERSION: 9.0.2 + - ARCH: x86_64 + OS: [alpine3_12] tags: - x86_64-linux before_script: # for cabal build - sudo apk add --no-cache zlib zlib-dev zlib-static - image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV" + image: "registry.gitlab.haskell.org/ghc/ci-images/$PLATFORM:$DOCKER_REV" variables: - TARBALL_ARCHIVE_SUFFIX: x86_64-linux-alpine + PLATFORM: "${ARCH}-linux-${OS}" + TARBALL_ARCHIVE_SUFFIX: $PLATFORM TARBALL_EXT: tar.xz ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"