File tree Expand file tree Collapse file tree 3 files changed +12
-13
lines changed
Expand file tree Collapse file tree 3 files changed +12
-13
lines changed Original file line number Diff line number Diff line change 2121 - name : 🔍 Determine stack resolver & GHC
2222 run : |
2323 STACK_RESOLVER=$(yq .resolver stack.yaml)
24- GHC_VERSION=$(yq .compiler stack.yaml)
24+ GHC_VERSION=$(echo $( yq .compiler stack.yaml) | cut -c 5- )
2525 echo STACK_RESOLVER="${STACK_RESOLVER}" >> "${GITHUB_ENV}"
2626 echo GHC_VERSION="${GHC_VERSION}" >> "${GITHUB_ENV}"
2727
@@ -48,15 +48,14 @@ jobs:
4848
4949 # actions:
5050
51- - name : ⏬ Install stack
52- run : |
53- # mkdir -p ~/.local/bin
54- # export PATH=~/.local/bin:$PATH
55- ## Stack is preinstalled on the GHA runners
56- # curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack
57- # if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
58- stack --version
59-
51+ - name : ⏬ Setup Haskell
52+ uses : haskell-actions/setup@v2
53+ id : setup-haskell
54+ with :
55+ ghc-version : ${{ env.GHC_VERSION }}
56+ enable-stack : true
57+ stack-version : ' latest'
58+
6059 - name : ⏬ Install dependencies
6160 run : |
6261 stack build --only-dependencies
Original file line number Diff line number Diff line change 2121 - name : 🔍 Determine stack resolver & GHC
2222 run : |
2323 STACK_RESOLVER=$(yq .resolver stack.yaml)
24- GHC_VERSION=$(yq .compiler stack.yaml)
24+ GHC_VERSION=$(echo $( yq .compiler stack.yaml) | cut -c 5- )
2525 echo STACK_RESOLVER="${STACK_RESOLVER}" >> "${GITHUB_ENV}"
2626 echo GHC_VERSION="${GHC_VERSION}" >> "${GITHUB_ENV}"
2727
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ name: CI (Windows)
44
55on :
66 push :
7- branches : [master, ci-*]
7+ branches : [master, ci-*, ci ]
88 tags :
99 - ' v*' # Push events to matching v*, i.e. v1.0, v20.15.10
1010 pull_request :
3333 run : |
3434 STACK_ROOT="C:/Users/runneradmin/AppData/Local/Programs/stack/x86_64-windows"
3535 STACK_RESOLVER=$(yq .resolver stack.yaml)
36- GHC_VERSION=$(yq .compiler stack.yaml)
36+ GHC_VERSION=$(echo $( yq .compiler stack.yaml) | cut -c 5- )
3737 echo STACK_ROOT="${STACK_ROOT}" >> "${GITHUB_ENV}"
3838 echo STACK_RESOLVER="${STACK_RESOLVER}" >> "${GITHUB_ENV}"
3939 echo GHC_VERSION="${GHC_VERSION}" >> "${GITHUB_ENV}"
You can’t perform that action at this time.
0 commit comments