Skip to content

Commit 91ba75d

Browse files
simonmichaelsimonmichael
committed
;github:workflows: rename ghc caching id for clarity
1 parent f7a9190 commit 91ba75d

File tree

6 files changed

+78
-78
lines changed

6 files changed

+78
-78
lines changed

‎.github/workflows/binaries-linux-x64.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
env:
1818
stack: stack
19-
ghc: 9.12.2
19+
ghcid: 9.12.2
2020

2121
steps:
2222

@@ -37,18 +37,18 @@ jobs:
3737
uses: actions/cache@v4
3838
with:
3939
path: ~/.ghcup
40-
key: ${{ runner.os }}-x64-ghcup-${{ env.ghc }}-${{ hashFiles('**.yaml') }}
40+
key: ${{ runner.os }}-x64-ghcup-${{ env.ghcid }}-${{ hashFiles('**.yaml') }}
4141
restore-keys: |
42-
${{ runner.os }}-x64-ghcup-${{ env.ghc }}
42+
${{ runner.os }}-x64-ghcup-${{ env.ghcid }}
4343
4444
- name: Cache - ~/.cabal
4545
id: cabal
4646
uses: actions/cache@v4
4747
with:
4848
path: ~/.cabal
49-
key: ${{ runner.os }}-x64-cabal-${{ env.ghc }}-${{ hashFiles('**.yaml') }}
49+
key: ${{ runner.os }}-x64-cabal-${{ env.ghcid }}-${{ hashFiles('**.yaml') }}
5050
restore-keys: |
51-
${{ runner.os }}-x64-cabal-${{ env.ghc }}
51+
${{ runner.os }}-x64-cabal-${{ env.ghcid }}
5252
5353
# actions:
5454

‎.github/workflows/binaries-mac-arm64.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
env:
1717
stack: stack
18-
ghc: 9.12.2
18+
ghcid: 9.12.2
1919

2020
steps:
2121

@@ -41,58 +41,58 @@ jobs:
4141
uses: actions/cache@v4
4242
with:
4343
path: ~/.local/bin
44-
key: ${{ runner.os }}-arm64-stack-programs-${{ env.ghc }}-${{ hashFiles('**.yaml') }}
44+
key: ${{ runner.os }}-arm64-stack-programs-${{ env.ghcid }}-${{ hashFiles('**.yaml') }}
4545
restore-keys: |
46-
${{ runner.os }}-arm64-stack-programs-${{ env.ghc }}
46+
${{ runner.os }}-arm64-stack-programs-${{ env.ghcid }}
4747
4848
- name: Cache - ~/.stack
4949
id: stack-global
5050
uses: actions/cache@v4
5151
with:
5252
path: ~/.stack
53-
key: ${{ runner.os }}-arm64-stack-global-${{ env.ghc }}-${{ hashFiles('**.yaml') }}
53+
key: ${{ runner.os }}-arm64-stack-global-${{ env.ghcid }}-${{ hashFiles('**.yaml') }}
5454
restore-keys: |
55-
${{ runner.os }}-arm64-stack-global-${{ env.ghc }}
55+
${{ runner.os }}-arm64-stack-global-${{ env.ghcid }}
5656
5757
- name: Cache - ./.stack-work
5858
uses: actions/cache@v4
5959
with:
6060
path: .stack-work
61-
key: ${{ runner.os }}-arm64-stack-work-${{ env.ghc }}-${{ hashFiles('**.yaml') }}
61+
key: ${{ runner.os }}-arm64-stack-work-${{ env.ghcid }}-${{ hashFiles('**.yaml') }}
6262
restore-keys: |
63-
${{ runner.os }}-arm64-stack-work-${{ env.ghc }}
63+
${{ runner.os }}-arm64-stack-work-${{ env.ghcid }}
6464
6565
- name: Cache - hledger-lib/.stack-work
6666
uses: actions/cache@v4
6767
with:
6868
path: hledger-lib/.stack-work
69-
key: ${{ runner.os }}-arm64-hledger-lib-stack-work-${{ env.ghc }}-${{ hashFiles('hledger-lib/package.yaml') }}
69+
key: ${{ runner.os }}-arm64-hledger-lib-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger-lib/package.yaml') }}
7070
restore-keys: |
71-
${{ runner.os }}-arm64-hledger-lib-stack-work-${{ env.ghc }}
71+
${{ runner.os }}-arm64-hledger-lib-stack-work-${{ env.ghcid }}
7272
7373
- name: Cache - hledger/.stack-work
7474
uses: actions/cache@v4
7575
with:
7676
path: hledger/.stack-work
77-
key: ${{ runner.os }}-arm64-hledger-stack-work-${{ env.ghc }}-${{ hashFiles('hledger/package.yaml') }}
77+
key: ${{ runner.os }}-arm64-hledger-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger/package.yaml') }}
7878
restore-keys: |
79-
${{ runner.os }}-arm64-hledger-stack-work-${{ env.ghc }}
79+
${{ runner.os }}-arm64-hledger-stack-work-${{ env.ghcid }}
8080
8181
- name: Cache - hledger-ui/.stack-work
8282
uses: actions/cache@v4
8383
with:
8484
path: hledger-ui/.stack-work
85-
key: ${{ runner.os }}-arm64-hledger-ui-stack-work-${{ env.ghc }}-${{ hashFiles('hledger-ui/package.yaml') }}
85+
key: ${{ runner.os }}-arm64-hledger-ui-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger-ui/package.yaml') }}
8686
restore-keys: |
87-
${{ runner.os }}-arm64-hledger-ui-stack-work-${{ env.ghc }}
87+
${{ runner.os }}-arm64-hledger-ui-stack-work-${{ env.ghcid }}
8888
8989
- name: Cache - hledger-web/.stack-work
9090
uses: actions/cache@v4
9191
with:
9292
path: hledger-web/.stack-work
93-
key: ${{ runner.os }}-arm64-hledger-web-stack-work-${{ env.ghc }}-${{ hashFiles('hledger-web/package.yaml') }}
93+
key: ${{ runner.os }}-arm64-hledger-web-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger-web/package.yaml') }}
9494
restore-keys: |
95-
${{ runner.os }}-arm64-hledger-web-stack-work-${{ env.ghc }}
95+
${{ runner.os }}-arm64-hledger-web-stack-work-${{ env.ghcid }}
9696
9797
# actions:
9898

‎.github/workflows/binaries-mac-x64.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
env:
1717
stack: stack
18-
ghc: 9.12.2
18+
ghcid: 9.12.2
1919

2020
steps:
2121

@@ -41,58 +41,58 @@ jobs:
4141
uses: actions/cache@v4
4242
with:
4343
path: ~/.local/bin
44-
key: ${{ runner.os }}-x64-stack-programs-${{ env.ghc }}-${{ hashFiles('**.yaml') }}
44+
key: ${{ runner.os }}-x64-stack-programs-${{ env.ghcid }}-${{ hashFiles('**.yaml') }}
4545
restore-keys: |
46-
${{ runner.os }}-x64-stack-programs-${{ env.ghc }}
46+
${{ runner.os }}-x64-stack-programs-${{ env.ghcid }}
4747
4848
- name: Cache - ~/.stack
4949
id: stack-global
5050
uses: actions/cache@v4
5151
with:
5252
path: ~/.stack
53-
key: ${{ runner.os }}-x64-stack-global-${{ env.ghc }}-${{ hashFiles('**.yaml') }}
53+
key: ${{ runner.os }}-x64-stack-global-${{ env.ghcid }}-${{ hashFiles('**.yaml') }}
5454
restore-keys: |
55-
${{ runner.os }}-x64-stack-global-${{ env.ghc }}
55+
${{ runner.os }}-x64-stack-global-${{ env.ghcid }}
5656
5757
- name: Cache - ./.stack-work
5858
uses: actions/cache@v4
5959
with:
6060
path: .stack-work
61-
key: ${{ runner.os }}-x64-stack-work-${{ env.ghc }}-${{ hashFiles('**.yaml') }}
61+
key: ${{ runner.os }}-x64-stack-work-${{ env.ghcid }}-${{ hashFiles('**.yaml') }}
6262
restore-keys: |
63-
${{ runner.os }}-x64-stack-work-${{ env.ghc }}
63+
${{ runner.os }}-x64-stack-work-${{ env.ghcid }}
6464
6565
- name: Cache - hledger-lib/.stack-work
6666
uses: actions/cache@v4
6767
with:
6868
path: hledger-lib/.stack-work
69-
key: ${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghc }}-${{ hashFiles('hledger-lib/package.yaml') }}
69+
key: ${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger-lib/package.yaml') }}
7070
restore-keys: |
71-
${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghc }}
71+
${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghcid }}
7272
7373
- name: Cache - hledger/.stack-work
7474
uses: actions/cache@v4
7575
with:
7676
path: hledger/.stack-work
77-
key: ${{ runner.os }}-x64-hledger-stack-work-${{ env.ghc }}-${{ hashFiles('hledger/package.yaml') }}
77+
key: ${{ runner.os }}-x64-hledger-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger/package.yaml') }}
7878
restore-keys: |
79-
${{ runner.os }}-x64-hledger-stack-work-${{ env.ghc }}
79+
${{ runner.os }}-x64-hledger-stack-work-${{ env.ghcid }}
8080
8181
- name: Cache - hledger-ui/.stack-work
8282
uses: actions/cache@v4
8383
with:
8484
path: hledger-ui/.stack-work
85-
key: ${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghc }}-${{ hashFiles('hledger-ui/package.yaml') }}
85+
key: ${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger-ui/package.yaml') }}
8686
restore-keys: |
87-
${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghc }}
87+
${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghcid }}
8888
8989
- name: Cache - hledger-web/.stack-work
9090
uses: actions/cache@v4
9191
with:
9292
path: hledger-web/.stack-work
93-
key: ${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghc }}-${{ hashFiles('hledger-web/package.yaml') }}
93+
key: ${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger-web/package.yaml') }}
9494
restore-keys: |
95-
${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghc }}
95+
${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghcid }}
9696
9797
# actions:
9898

‎.github/workflows/binaries-windows-x64.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
env:
2121
# use preinstalled ghc 9.12.2
2222
stack: stack --system-ghc --no-install-ghc --stack-yaml stack.yaml
23-
ghc: 9.12.2
23+
ghcid: 9.12.2
2424

2525
steps:
2626

@@ -49,49 +49,49 @@ jobs:
4949
uses: actions/cache@v4
5050
with:
5151
path: C:\Users\runneradmin\AppData\Roaming\stack\
52-
key: ${{ runner.os }}-x64-appdata-roaming-stack-${{ env.ghc }}-${{ hashFiles('**.yaml') }}
52+
key: ${{ runner.os }}-x64-appdata-roaming-stack-${{ env.ghcid }}-${{ hashFiles('**.yaml') }}
5353
restore-keys: |
54-
${{ runner.os }}-x64-appdata-roaming-stack-${{ env.ghc }}
54+
${{ runner.os }}-x64-appdata-roaming-stack-${{ env.ghcid }}
5555
5656
- name: Cache - ./.stack-work
5757
uses: actions/cache@v4
5858
with:
5959
path: .stack-work
60-
key: ${{ runner.os }}-x64-stack-work-${{ env.ghc }}-${{ hashFiles('**.yaml') }}
60+
key: ${{ runner.os }}-x64-stack-work-${{ env.ghcid }}-${{ hashFiles('**.yaml') }}
6161
restore-keys: |
62-
${{ runner.os }}-x64-stack-work-${{ env.ghc }}
62+
${{ runner.os }}-x64-stack-work-${{ env.ghcid }}
6363
6464
- name: Cache - hledger-lib/.stack-work
6565
uses: actions/cache@v4
6666
with:
6767
path: hledger-lib/.stack-work
68-
key: ${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghc }}-${{ hashFiles('hledger-lib/package.yaml') }}
68+
key: ${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger-lib/package.yaml') }}
6969
restore-keys: |
70-
${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghc }}
70+
${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghcid }}
7171
7272
- name: Cache - hledger/.stack-work
7373
uses: actions/cache@v4
7474
with:
7575
path: hledger/.stack-work
76-
key: ${{ runner.os }}-x64-hledger-stack-work-${{ env.ghc }}-${{ hashFiles('hledger/package.yaml') }}
76+
key: ${{ runner.os }}-x64-hledger-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger/package.yaml') }}
7777
restore-keys: |
78-
${{ runner.os }}-x64-hledger-stack-work-${{ env.ghc }}
78+
${{ runner.os }}-x64-hledger-stack-work-${{ env.ghcid }}
7979
8080
- name: Cache - hledger-ui/.stack-work
8181
uses: actions/cache@v4
8282
with:
8383
path: hledger-ui/.stack-work
84-
key: ${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghc }}-${{ hashFiles('hledger-ui/package.yaml') }}
84+
key: ${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger-ui/package.yaml') }}
8585
restore-keys: |
86-
${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghc }}
86+
${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghcid }}
8787
8888
- name: Cache - hledger-web/.stack-work
8989
uses: actions/cache@v4
9090
with:
9191
path: hledger-web/.stack-work
92-
key: ${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghc }}-${{ hashFiles('hledger-web/package.yaml') }}
92+
key: ${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghcid }}-${{ hashFiles('hledger-web/package.yaml') }}
9393
restore-keys: |
94-
${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghc }}
94+
${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghcid }}
9595
9696
# actions
9797

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151

5252
env:
5353
stack: stack
54-
ghc: 9.10.1
54+
ghcid: 9.10.1
5555
cachedate: 20250615 # bump this when new caches are needed
5656

5757
# flag for skipping later steps, declared here to prevent "Context access might be invalid" warnings
@@ -151,64 +151,64 @@ jobs:
151151
# XXX if stack.yaml is a symlink, this fails with
152152
# Error: The template is not valid. .github/workflows/push.yml (Line: 103, Col: 14): hashFiles('**.yaml') failed.
153153
# Fail to hash files under directory '/home/runner/work/hledger/hledger'
154-
key: ${{ runner.os }}-x64-stack-global-${{ env.ghc }}-${{ env.cachedate }}-${{ hashFiles('**.yaml') }}
154+
key: ${{ runner.os }}-x64-stack-global-${{ env.ghcid }}-${{ env.cachedate }}-${{ hashFiles('**.yaml') }}
155155
restore-keys: |
156-
${{ runner.os }}-x64-stack-global-${{ env.ghc }}-${{ env.cachedate }}
156+
${{ runner.os }}-x64-stack-global-${{ env.ghcid }}-${{ env.cachedate }}
157157
if: env.do-all
158158

159159
- name: Cache - stack-installed programs in ~/.local/bin
160160
id: stack-programs
161161
uses: actions/cache@v4
162162
with:
163163
path: ~/.local/bin
164-
key: ${{ runner.os }}-x64-stack-programs-${{ env.ghc }}-${{ env.cachedate }}-${{ hashFiles('**.yaml') }}
164+
key: ${{ runner.os }}-x64-stack-programs-${{ env.ghcid }}-${{ env.cachedate }}-${{ hashFiles('**.yaml') }}
165165
restore-keys: |
166-
${{ runner.os }}-x64-stack-programs-${{ env.ghc }}-${{ env.cachedate }}
166+
${{ runner.os }}-x64-stack-programs-${{ env.ghcid }}-${{ env.cachedate }}
167167
if: env.do-all
168168

169169
- name: Cache - .stack-work
170170
uses: actions/cache@v4
171171
with:
172172
path: .stack-work
173-
key: ${{ runner.os }}-x64-stack-work-${{ env.ghc }}-${{ env.cachedate }}-${{ hashFiles('**.yaml') }}
173+
key: ${{ runner.os }}-x64-stack-work-${{ env.ghcid }}-${{ env.cachedate }}-${{ hashFiles('**.yaml') }}
174174
restore-keys: |
175-
${{ runner.os }}-x64-stack-work-${{ env.ghc }}-${{ env.cachedate }}
175+
${{ runner.os }}-x64-stack-work-${{ env.ghcid }}-${{ env.cachedate }}
176176
if: env.do-all
177177

178178
- name: Cache - hledger-lib/.stack-work
179179
uses: actions/cache@v4
180180
with:
181181
path: hledger-lib/.stack-work
182-
key: ${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghc }}-${{ env.cachedate }}-${{ hashFiles('hledger-lib/package.yaml') }}
182+
key: ${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghcid }}-${{ env.cachedate }}-${{ hashFiles('hledger-lib/package.yaml') }}
183183
restore-keys: |
184-
${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghc }}-${{ env.cachedate }}
184+
${{ runner.os }}-x64-hledger-lib-stack-work-${{ env.ghcid }}-${{ env.cachedate }}
185185
if: env.do-all
186186

187187
- name: Cache - hledger/.stack-work
188188
uses: actions/cache@v4
189189
with:
190190
path: hledger/.stack-work
191-
key: ${{ runner.os }}-x64-hledger-stack-work-${{ env.ghc }}-${{ env.cachedate }}-${{ hashFiles('hledger/package.yaml') }}
191+
key: ${{ runner.os }}-x64-hledger-stack-work-${{ env.ghcid }}-${{ env.cachedate }}-${{ hashFiles('hledger/package.yaml') }}
192192
restore-keys: |
193-
${{ runner.os }}-x64-hledger-stack-work-${{ env.ghc }}-${{ env.cachedate }}
193+
${{ runner.os }}-x64-hledger-stack-work-${{ env.ghcid }}-${{ env.cachedate }}
194194
if: env.do-all
195195

196196
- name: Cache - hledger-ui/.stack-work
197197
uses: actions/cache@v4
198198
with:
199199
path: hledger-ui/.stack-work
200-
key: ${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghc }}-${{ env.cachedate }}-${{ hashFiles('hledger-ui/package.yaml') }}
200+
key: ${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghcid }}-${{ env.cachedate }}-${{ hashFiles('hledger-ui/package.yaml') }}
201201
restore-keys: |
202-
${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghc }}-${{ env.cachedate }}
202+
${{ runner.os }}-x64-hledger-ui-stack-work-${{ env.ghcid }}-${{ env.cachedate }}
203203
if: env.do-all
204204

205205
- name: Cache - hledger-web/.stack-work
206206
uses: actions/cache@v4
207207
with:
208208
path: hledger-web/.stack-work
209-
key: ${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghc }}-${{ env.cachedate }}-${{ hashFiles('hledger-web/package.yaml') }}
209+
key: ${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghcid }}-${{ env.cachedate }}-${{ hashFiles('hledger-web/package.yaml') }}
210210
restore-keys: |
211-
${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghc }}-${{ env.cachedate }}
211+
${{ runner.os }}-x64-hledger-web-stack-work-${{ env.ghcid }}-${{ env.cachedate }}
212212
if: env.do-all
213213

214214
# Ensure the ghc version we need is installed.

0 commit comments

Comments
 (0)