diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-02-24 10:48:38 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2021-03-07 22:19:19 +0800 |
| commit | 251892b98f4b19bfe2749cf4790f6ebcc6eb3e08 (patch) | |
| tree | 0143674a9d6f5318e1027acff3c3139ca4eab56f | |
| parent | b9d3082823a3fdf5f2dd40f747c87afc57b09f92 (diff) | |
| download | haskell-251892b98f4b19bfe2749cf4790f6ebcc6eb3e08.tar.gz | |
[ci/darwin] bump nixpkgs rev
| -rw-r--r-- | .gitlab-ci.yml | 74 |
1 files changed, 39 insertions, 35 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f792b96d92..e1d164e8e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -388,40 +388,39 @@ release-x86_64-freebsd: # x86_64-darwin ################################# -# validate-x86_64-darwin: -# extends: .validate -# stage: full-build -# tags: -# - x86_64-darwin -# variables: -# GHC_VERSION: 8.6.5 -# CABAL_INSTALL_VERSION: 3.0.0.0 -# BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-apple-darwin.tar.xz" -# MACOSX_DEPLOYMENT_TARGET: "10.7" -# # Only Sierra and onwards supports clock_gettime. See #12858 -# ac_cv_func_clock_gettime: "no" -# LANG: "en_US.UTF-8" -# CONFIGURE_ARGS: "--with-intree-gmp" -# TEST_ENV: "x86_64-darwin" -# BUILD_FLAVOUR: "perf" -# after_script: -# - cp -Rf $HOME/.cabal cabal-cache -# - .gitlab/ci.sh clean -# artifacts: -# when: always -# expire_in: 2 week -# cache: -# key: "darwin-$GHC_VERSION" -# paths: -# - cabal-cache -# - toolchain - -validate-aarch64-darwin: +validate-x86_64-darwin-old: extends: .validate stage: full-build tags: - x86_64-darwin - - m1 + variables: + GHC_VERSION: 8.6.5 + CABAL_INSTALL_VERSION: 3.0.0.0 + BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-apple-darwin.tar.xz" + MACOSX_DEPLOYMENT_TARGET: "10.7" + # Only Sierra and onwards supports clock_gettime. See #12858 + ac_cv_func_clock_gettime: "no" + LANG: "en_US.UTF-8" + CONFIGURE_ARGS: "--with-intree-gmp" + TEST_ENV: "x86_64-darwin" + BUILD_FLAVOUR: "perf" + after_script: + - cp -Rf $HOME/.cabal cabal-cache + - .gitlab/ci.sh clean + artifacts: + when: always + expire_in: 2 week + cache: + key: "darwin-$GHC_VERSION" + paths: + - cabal-cache + - toolchain + +validate-x86_64-darwin: + extends: .validate + stage: full-build + tags: + - x86_64-darwin-m1 # for now make this non mandatory to pass. allow_failure: true @@ -431,8 +430,13 @@ validate-aarch64-darwin: MAKE_ARGS: "-Werror" GHC_VERSION: 8.10.3 CABAL_INSTALL_VERSION: 3.2.0.0 - BUILD_FLAVOUR: "quick" + BUILD_FLAVOUR: "perf" BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-apple-darwin.tar.xz" + + MACOSX_DEPLOYMENT_TARGET: "10.7" + # Only Sierra and onwards supports clock_gettime. See #12858 + ac_cv_func_clock_gettime: "no" + # we run on M1's for now, getconf can't be built with nix yet, # and we use a pure shell, so we can't/shouldn't use /usr/bin/getconf # inside th shell. @@ -448,13 +452,14 @@ validate-aarch64-darwin: set -Eeuo pipefail function runInNixShell() { nix-shell .gitlab/shell.nix \ - -I nixpkgs=https://github.com/angerman/nixpkgs/archive/257cb120334.tar.gz \ + -I nixpkgs=https://github.com/angerman/nixpkgs/archive/75f7281738b.tar.gz \ --argstr system "x86_64-darwin" \ --pure \ --keep GHC_VERSION --keep CABAL_INSTALL_VERSION --keep BUILD_FLAVOUR \ --keep BIN_DIST_PREP_TAR_COMP --keep CPUS --keep PROJECT_DIR \ --keep CI_PROJECT_DIR --keep MAKE_ARGS \ --keep LANG --keep CONFIGURE_ARGS \ + --keep MACOSX_DEPLOYMENT_TARGET --keep ac_cv_func_clock_gettime \ --run "$1" } # fix up config.sub in libraries for the time. @@ -478,8 +483,7 @@ validate-aarch64-darwin: extends: .validate stage: full-build tags: - - aarch64-darwin - - m1 + - aarch64-darwin-m1 # for now make this non mandatory to pass. allow_failure: true @@ -506,7 +510,7 @@ validate-aarch64-darwin: set -Eeuo pipefail function runInNixShell() { nix-shell .gitlab/shell.nix \ - -I nixpkgs=https://github.com/angerman/nixpkgs/archive/257cb120334.tar.gz \ + -I nixpkgs=https://github.com/angerman/nixpkgs/archive/75f7281738b.tar.gz \ --argstr system "aarch64-darwin" \ --pure \ --keep GHC_VERSION --keep CABAL_INSTALL_VERSION --keep BUILD_FLAVOUR \ |