diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-11-09 11:28:59 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-11-16 03:12:34 -0500 |
| commit | a8e1a75673e9c79a1504f16e87c6bd57488b3fbc (patch) | |
| tree | 08dee01d7ab1033c0ec2b8f97bdc6c63afc3e472 /.gitlab-ci.yml | |
| parent | cc635da167fdec2dead0603b0026cb841f0aa645 (diff) | |
| download | haskell-a8e1a75673e9c79a1504f16e87c6bd57488b3fbc.tar.gz | |
gitlab-ci: Refactor toolchain provision
This makes it easier to invoke ci.sh on Darwin by teaching it to manage
the nix business.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77958e29f3..497cb02e21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -544,6 +544,7 @@ validate-x86_64-darwin: - x86_64-darwin-m1 variables: + NIX_SYSTEM: x86_64-darwin BUILD_FLAVOUR: "validate" GHC_VERSION: 8.10.4 CABAL_INSTALL_VERSION: 3.2.0.0 @@ -573,10 +574,6 @@ validate-x86_64-darwin: - cat ci-timings script: | - nix build -f .gitlab/darwin/toolchain.nix --argstr system x86_64-darwin -o toolchain.sh - source toolchain.sh - cat toolchain.sh - sdk_path="$(xcrun --sdk macosx --show-sdk-path)" CONFIGURE_ARGS="$CONFIGURE_ARGS --with-ffi-libraries=$sdk_path/usr/lib --with-ffi-includes=$sdk_path/usr/include/ffi" @@ -603,6 +600,7 @@ validate-aarch64-darwin: - aarch64-darwin-m1 variables: + NIX_SYSTEM: aarch64-darwin BUILD_FLAVOUR: "validate" TEST_TYPE: test MAKE_ARGS: "-Werror" @@ -629,10 +627,6 @@ validate-aarch64-darwin: # behave very differently. -i bash does not pass any nix related env vars # the whole $stdenv/setup part seems to be missing. script: | - nix build -f .gitlab/darwin/toolchain.nix --argstr system aarch64-darwin -o toolchain.sh - source toolchain.sh - cat toolchain.sh - sdk_path="$(xcrun --sdk macosx --show-sdk-path)" CONFIGURE_ARGS="$CONFIGURE_ARGS --with-ffi-libraries=$sdk_path/usr/lib --with-ffi-includes=$sdk_path/usr/include/ffi" |