From 8c9ca24adfe16740c8b2d5e47ccab69b66fc1e2e Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sun, 18 Oct 2020 22:45:25 -0700 Subject: [PATCH] ci: tweak --- .github/workflows/mac.yml | 4 ++-- .github/workflows/windows.yml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 07abcfc50..afd25e9ff 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -115,8 +115,8 @@ jobs: mkdir -p ~/.local/bin export PATH=~/.local/bin:$PATH brew install gnu-tar - curl -sL https://get.haskellstack.org/stable/osx-x86_64 | gtar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack - # if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/osx-x86_64 | gtar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi + curl -sL https://get.haskellstack.org/stable/osx-x86_64.tar.gz | gtar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack + # if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/osx-x86_64.tar.gz | gtar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi stack --version - name: Install GHC diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e6aee7085..8abc53c4d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -121,13 +121,12 @@ jobs: #if: steps.stack-programs-dir.outputs.cache-hit != 'true' # this step is needed to get stack.exe into PATH, for now run: | - # url is not consistent for windows - # curl -sL https://get.haskellstack.org/stable/windows-x86_64 -o stack.zip - curl -sL http://www.stackage.org/stack/windows-x86_64 -o stack.zip + curl -sL https://get.haskellstack.org/stable/windows-x86_64.zip -o stack.zip # 7z x stack.zip -oC:\Windows stack.exe 7z x stack.zip stack.exe which stack ./stack --version + stack --version # resolver lts-15.3 to avoid GHC 8.8.3 access violation, https://gitlab.haskell.org/ghc/ghc/issues/17926: