From 3d9ef1e041c07285807a39a8f9a7e0d2a841f39e Mon Sep 17 00:00:00 2001 From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com> Date: Sun, 3 Dec 2023 11:54:59 -0500 Subject: [PATCH] Rename function / Run tests on macos-latest --- .github/workflows/build.yml | 2 +- lib/utils.bash | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 206a2db..b2d4251 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: - # - macos-latest + - macos-latest - ubuntu-latest test: - plugin: cabal diff --git a/lib/utils.bash b/lib/utils.bash index bdd8a45..8e84ed6 100644 --- a/lib/utils.bash +++ b/lib/utils.bash @@ -8,7 +8,7 @@ ghcup_bin_dir() { echo "$(asdf_plugin_path)/.ghcup/bin" } -check_ghcup() { +ensure_ghcup() { if ! test -f "$(ghcup_bin_dir)/ghcup" then curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | env \ @@ -20,7 +20,7 @@ check_ghcup() { } list_all_versions() { - check_ghcup + ensure_ghcup "$(ghcup_bin_dir)/ghcup" list -t "$1" -r | awk '{printf $2" "}' } @@ -33,7 +33,7 @@ install_version() { local version="$2" local path="$3" - check_ghcup + ensure_ghcup if [[ "$tool" == "ghc" ]] || { [[ "$tool" == "hls" ]] && [[ $(ver "$version") -ge $(ver "1.7") ]]; } then