Skip to content

Commit

Permalink
Release CI: fixes and improvements (#9348)
Browse files Browse the repository at this point in the history
* gitlab ci: Don't install stack

Fixes #9304

* Repair cabal's index state

Fixes #9312

* Expand alpine builds to include i386

Note the use of ghc-9.0.2 for i386-alpine.

Resolves #9347

(cherry picked from commit 535211f)
  • Loading branch information
chreekat authored and mergify[bot] committed Oct 17, 2023
1 parent 0f2350c commit 63f9ec5
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
14 changes: 11 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
3 changes: 3 additions & 0 deletions .gitlab/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
export BOOTSTRAP_HASKELL_GHC_VERSION=$GHC_VERSION
export BOOTSTRAP_HASKELL_CABAL_VERSION=$CABAL_INSTALL_VERSION
export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=yes
# We don't use stack, and it isn't available on i386-deb9
export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes

# for some reason the subshell doesn't pick up the arm64 environment on darwin
# and starts installing x86_64 GHC
Expand Down Expand Up @@ -63,6 +65,7 @@ args=(
${ADD_CABAL_ARGS}
)

run cabal update hackage.haskell.org,HEAD
run cabal v2-build ${args[@]} cabal-install

mkdir "$CI_PROJECT_DIR/out"
Expand Down
1 change: 1 addition & 0 deletions cabal.project.release
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ packages: cabal-install/
tests: False
benchmarks: False
optimization: True
index-state: hackage.haskell.org 2023-10-13T10:16:13Z

0 comments on commit 63f9ec5

Please sign in to comment.