Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 9c0664b

Browse files
committed
README: updated model workflow to use new outputs.TOOL-version
1 parent 6315d94 commit 9c0664b

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

setup/README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,6 @@ jobs:
141141
cabal-version: 'latest'
142142
cabal-update: true
143143

144-
- name: Installed minor versions of GHC and Cabal
145-
shell: bash
146-
run: |
147-
GHC_VERSION=$(ghc --numeric-version)
148-
CABAL_VERSION=$(cabal --numeric-version)
149-
echo "GHC_VERSION=${GHC_VERSION}" >> "${GITHUB_ENV}"
150-
echo "CABAL_VERSION=${CABAL_VERSION}" >> "${GITHUB_ENV}"
151-
152144
- name: Configure the build
153145
run: |
154146
cabal configure --enable-tests --enable-benchmarks --disable-documentation
@@ -158,11 +150,12 @@ jobs:
158150
- name: Restore cached dependencies
159151
uses: actions/cache/restore@v3
160152
id: cache
153+
env:
154+
key: ${{ runner.os }}-ghc-${{ steps.setup.outputs.ghc-version }}-cabal-${{ steps.setup.outputs.cabal-version }}
161155
with:
162156
path: ${{ steps.setup.outputs.cabal-store }}
163-
key: ${{ runner.os }}-ghc-${{ env.GHC_VERSION }}-cabal-${{ env.CABAL_VERSION }}-plan-${{ hashFiles('**/plan.json') }}
164-
restore-keys: |
165-
${{ runner.os }}-ghc-${{ env.GHC_VERSION }}-cabal-${{ env.CABAL_VERSION }}-
157+
key: ${{ env.key }}-plan-${{ hashFiles('**/plan.json') }}
158+
restore-keys: ${{ env.key }}-
166159

167160
- name: Install dependencies
168161
run: cabal build all --only-dependencies

0 commit comments

Comments
 (0)