Skip to content

Commit d02e962

Browse files
alt-romesulysses4ever
authored andcommitted
ci: Fix quick-jobs GHC version to 9.6 (#10026)
(cherry picked from commit 305033b) # Conflicts: # .github/workflows/quick-jobs.yml
1 parent 934f084 commit d02e962

File tree

1 file changed

+64
-0
lines changed

1 file changed

+64
-0
lines changed

.github/workflows/quick-jobs.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,35 @@ on:
1414
types:
1515
- created
1616

17+
env:
18+
GHC_FOR_QUICK_JOBS: 9.6.5
19+
1720
jobs:
1821
meta:
1922
name: Meta checks
2023
runs-on: ubuntu-latest
24+
<<<<<<< HEAD
2125
# This job is not run in a container, any recent GHC should be fine
2226
steps:
2327
- name: Set PATH
2428
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#adding-a-system-path
29+
=======
30+
env:
31+
cabal_build: >-
32+
cabal build --builddir=dist-newstyle-meta --project-file=cabal.meta.project
33+
gen-cabal-macros
34+
gen-paths-module
35+
gen-spdx
36+
gen-spdx-exc
37+
steps:
38+
- name: ghcup
39+
run: |
40+
ghcup --version
41+
ghcup config set cache true
42+
ghcup install ghc $GHC_FOR_QUICK_JOBS
43+
ghcup set ghc $GHC_FOR_QUICK_JOBS
44+
- name: Haskell versions
45+
>>>>>>> 305033b30 (ci: Fix quick-jobs GHC version to 9.6 (#10026))
2546
run: |
2647
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
2748
- uses: actions/cache@v3
@@ -62,7 +83,26 @@ jobs:
6283
name: Doctest Cabal
6384
runs-on: ubuntu-latest
6485
steps:
86+
<<<<<<< HEAD
6587
- name: Set PATH
88+
=======
89+
- name: ghcup
90+
run: |
91+
ghcup --version
92+
ghcup config set cache true
93+
ghcup install ghc $GHC_FOR_QUICK_JOBS
94+
ghcup set ghc $GHC_FOR_QUICK_JOBS
95+
- name: Haskell versions
96+
run: |
97+
ghc --version
98+
cabal --version
99+
# It is complicated to get a proper cache key for the dependencies of a package
100+
# (here: doctest) that we just `cabal install`.
101+
# So, as a heuristics we update the cache once per day.
102+
# Updating it with each run would be an alternative, but we a short of cache space,
103+
# and this would generate too many new caches.
104+
- name: Use date as cache key
105+
>>>>>>> 305033b30 (ci: Fix quick-jobs GHC version to 9.6 (#10026))
66106
run: |
67107
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
68108
- uses: actions/cache@v3
@@ -96,6 +136,7 @@ jobs:
96136
name: Check Field Syntax Reference
97137
runs-on: ubuntu-latest
98138
steps:
139+
<<<<<<< HEAD
99140
- name: Set PATH
100141
run: |
101142
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -113,12 +154,23 @@ jobs:
113154
sudo chown -R $USER /usr/local/.ghcup
114155
sudo chmod -R 777 /usr/local/.ghcup
115156
fi
157+
=======
158+
>>>>>>> 305033b30 (ci: Fix quick-jobs GHC version to 9.6 (#10026))
116159
- name: ghcup
117160
run: |
118161
ghcup --version
119162
ghcup config set cache true
163+
<<<<<<< HEAD
120164
ghcup install ghc --set recommended
121165
ghcup install cabal --set latest
166+
=======
167+
ghcup install ghc $GHC_FOR_QUICK_JOBS
168+
ghcup set ghc $GHC_FOR_QUICK_JOBS
169+
- name: Haskell versions
170+
run: |
171+
ghc --version
172+
cabal --version
173+
>>>>>>> 305033b30 (ci: Fix quick-jobs GHC version to 9.6 (#10026))
122174
- name: Update Hackage index
123175
run: cabal v2-update
124176
- uses: actions/checkout@v4
@@ -128,15 +180,27 @@ jobs:
128180
name: Check Release Project
129181
runs-on: ubuntu-latest
130182
steps:
183+
<<<<<<< HEAD
131184
- name: Set PATH
132185
run: |
133186
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
187+
=======
188+
>>>>>>> 305033b30 (ci: Fix quick-jobs GHC version to 9.6 (#10026))
134189
- name: ghcup
135190
run: |
136191
ghcup --version
137192
ghcup config set cache true
193+
<<<<<<< HEAD
138194
ghcup install ghc --set recommended
139195
ghcup install cabal --set latest
196+
=======
197+
ghcup install ghc $GHC_FOR_QUICK_JOBS
198+
ghcup set ghc $GHC_FOR_QUICK_JOBS
199+
- name: Haskell versions
200+
run: |
201+
ghc --version
202+
cabal --version
203+
>>>>>>> 305033b30 (ci: Fix quick-jobs GHC version to 9.6 (#10026))
140204
- name: Update Hackage Index
141205
run: cabal v2-update
142206
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)