ci: tweak

This commit is contained in:
Simon Michael 2020-10-18 22:45:25 -07:00
parent b2fcdcda16
commit 8c9ca24adf
2 changed files with 4 additions and 5 deletions

View File

@ -115,8 +115,8 @@ jobs:
mkdir -p ~/.local/bin mkdir -p ~/.local/bin
export PATH=~/.local/bin:$PATH export PATH=~/.local/bin:$PATH
brew install gnu-tar 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 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 | gtar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi # 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 stack --version
- name: Install GHC - name: Install GHC

View File

@ -121,13 +121,12 @@ jobs:
#if: steps.stack-programs-dir.outputs.cache-hit != 'true' #if: steps.stack-programs-dir.outputs.cache-hit != 'true'
# this step is needed to get stack.exe into PATH, for now # this step is needed to get stack.exe into PATH, for now
run: | run: |
# url is not consistent for windows curl -sL https://get.haskellstack.org/stable/windows-x86_64.zip -o stack.zip
# 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
# 7z x stack.zip -oC:\Windows stack.exe # 7z x stack.zip -oC:\Windows stack.exe
7z x stack.zip stack.exe 7z x stack.zip stack.exe
which stack which stack
./stack --version ./stack --version
stack --version
# resolver lts-15.3 to avoid GHC 8.8.3 access violation, https://gitlab.haskell.org/ghc/ghc/issues/17926: # resolver lts-15.3 to avoid GHC 8.8.3 access violation, https://gitlab.haskell.org/ghc/ghc/issues/17926: