Skip to content

Commit

Permalink
Rename function / Run tests on macos-latest
Browse files Browse the repository at this point in the history
  • Loading branch information
sestrella committed Dec 3, 2023
1 parent e53c144 commit 3d9ef1e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os:
# - macos-latest
- macos-latest
- ubuntu-latest
test:
- plugin: cabal
Expand Down
6 changes: 3 additions & 3 deletions lib/utils.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -20,7 +20,7 @@ check_ghcup() {
}

list_all_versions() {
check_ghcup
ensure_ghcup
"$(ghcup_bin_dir)/ghcup" list -t "$1" -r | awk '{printf $2" "}'
}

Expand All @@ -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
Expand Down

0 comments on commit 3d9ef1e

Please sign in to comment.