diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-08-28 15:11:47 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-08-28 15:13:53 -0400 |
| commit | 28d23a248bed3eabfa51b471b490e9cbf9247557 (patch) | |
| tree | ed369be2c30c70d9e0c39736fb2bfc62cdf0e468 | |
| parent | cff44d8686c1539ee77d34756d6b7908e120b96a (diff) | |
| download | haskell-wip/fix-darwin-ci.tar.gz | |
gitlab-ci: Fix URL of Darwin's cabal-install tarballwip/fix-darwin-ci
This was inadvertently referring to the cabal-install-latest/ directory
which is volatile.
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/darwin-init.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79643b4c23..5d3c08e79f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -301,6 +301,7 @@ validate-x86_64-darwin: - x86_64-darwin variables: GHC_VERSION: 8.6.5 + CABAL_INSTALL_VERSION: 2.4.1.0 BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-apple-darwin.tar.xz" MACOSX_DEPLOYMENT_TARGET: "10.7" # Only Sierra and onwards supports clock_gettime. See #12858 diff --git a/.gitlab/darwin-init.sh b/.gitlab/darwin-init.sh index ba5de9db35..3dadc04dc1 100644 --- a/.gitlab/darwin-init.sh +++ b/.gitlab/darwin-init.sh @@ -23,7 +23,7 @@ if [ ! -e $toolchain/bin/ghc ]; then fi if [ ! -e $toolchain/bin/cabal ]; then - cabal_tarball="https://downloads.haskell.org/~cabal/cabal-install-latest/cabal-install-2.4.1.0-x86_64-apple-darwin-sierra.tar.xz" + cabal_tarball="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL_VERSION/cabal-install-$CABAL_INSTALL_VERSION-x86_64-apple-darwin-sierra.tar.xz" echo "Fetching cabal-install from $cabal_tarball" curl $cabal_tarball | tar -xz mv cabal $toolchain/bin |