diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index 93aaf14b..ce9ba682 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -19,4 +19,7 @@ done echo "install cabal..." ghcup install-cabal +echo "Updating stack..." +ghcup install stack latest + invoke_tests "Haskell" diff --git a/images/macos/provision/core/stack.sh b/images/macos/provision/core/stack.sh deleted file mode 100644 index c84cd264..00000000 --- a/images/macos/provision/core/stack.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -e -o pipefail -source ~/utils/utils.sh - -echo "Get the latest Stack version..." -stackDownloadUrl=$(get_github_package_download_url "commercialhaskell/stack" "contains(\"osx-x86_64.tar.gz\")" "latest" "$API_PAT") -stackVersion=$(echo $stackDownloadUrl | cut -d "/" -f8 | tr -d "v") -stackArchive="/tmp/stack.tar.gz" - -echo "Download stack version $stackVersion..." -download_with_retries $stackDownloadUrl "/tmp" "stack.tar.gz" - -stackToolcachePath="$AGENT_TOOLSDIRECTORY/stack/$stackVersion" -destinationPath="$stackToolcachePath/x64" - -mkdir -p $destinationPath - -echo "Unzip stack archive..." -tar -xzf $stackArchive -C $destinationPath --strip 1 - -touch $stackToolcachePath/x64.complete - -echo "export PATH="\$PATH":$destinationPath" >> "$HOME/.bashrc" - -invoke_tests "Common" "Stack" diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json index e7f682c4..814580fb 100644 --- a/images/macos/templates/macOS-11.json +++ b/images/macos/templates/macOS-11.json @@ -194,7 +194,6 @@ "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/haskell.sh", - "./provision/core/stack.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/xamarin.sh", diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl index c13e60fa..5c1755b0 100644 --- a/images/macos/templates/macOS-12.anka.pkr.hcl +++ b/images/macos/templates/macOS-12.anka.pkr.hcl @@ -208,7 +208,6 @@ build { "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/haskell.sh", - "./provision/core/stack.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/xamarin.sh", diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json index 42460036..587d4d6d 100644 --- a/images/macos/templates/macOS-12.json +++ b/images/macos/templates/macOS-12.json @@ -195,7 +195,6 @@ "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/haskell.sh", - "./provision/core/stack.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/xamarin.sh", diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 7b833065..3366d803 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -203,7 +203,6 @@ build { "./provision/core/rust.sh", "./provision/core/gcc.sh", "./provision/core/haskell.sh", - "./provision/core/stack.sh", "./provision/core/cocoapods.sh", "./provision/core/android-toolsets.sh", "./provision/core/apache.sh",