Skip to content

Commit d3954ce

Browse files
committed
More
1 parent 240e166 commit d3954ce

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/bench.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ jobs:
4747
fail-fast: false
4848
matrix:
4949
ghc:
50-
- '8.10.7'
51-
- '9.2.7'
50+
- '8.10'
51+
- '9.2'
5252
os:
5353
- ubuntu-latest
5454

@@ -115,9 +115,9 @@ jobs:
115115
strategy:
116116
fail-fast: false
117117
matrix:
118-
ghc: ['8.10.7', '9.2.7']
118+
ghc: ['8.10', '9.2']
119119
os: [ubuntu-latest]
120-
cabal: ['3.6']
120+
cabal: ['3.10']
121121
example: ['cabal', 'lsp-types']
122122

123123
steps:

.github/workflows/caching.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
# Fetching from github cache is faster than doing it from hackage
103103
# Sources does not change per ghc and ghc version son only doing it
104104
# for one matrix job (it is arbitrary)
105-
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '8.10.7'
105+
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '8.10'
106106
name: Download sources
107107
run: |
108108
cabal $cabalBuild --only-download --enable-benchmarks --enable-tests
@@ -117,7 +117,7 @@ jobs:
117117
# We build ghcide with benchs and test enabled to include its dependencies in the cache
118118
# (including shake-bench)
119119
# Only for the same ghc and os used in the bench workflow, so we save cache space
120-
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '8.10.7'
120+
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '8.10'
121121
name: Build ghcide benchmark
122122
run: |
123123
cabal $cabalBuild ghcide --enable-benchmarks --enable-tests

.github/workflows/hackage.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040
"hls-qualify-imported-names-plugin", "hls-code-range-plugin",
4141
"hls-cabal-fmt-plugin",
4242
"haskell-language-server"]
43-
ghc: [ "9.0.2"
44-
, "8.10.7"
43+
ghc: [ "9.0"
44+
, "8.10"
4545
]
4646
exclude:
47-
- ghc: "9.0.2"
47+
- ghc: "9.0"
4848
package: "hls-stylish-haskell-plugin"
4949

5050
steps:
@@ -108,7 +108,7 @@ jobs:
108108
# The solver takes in account all project packages, even if they are not gonna be effectively built
109109
# (like stylish-haskell for ghc-9.0)
110110
- name: "Add temporary needed allow-newer for ghc-9.0"
111-
if: steps.get-hackage-version.outputs.exists != 'true' && matrix.ghc == '9.0.2'
111+
if: steps.get-hackage-version.outputs.exists != 'true' && matrix.ghc == '9.0'
112112
run: |
113113
cd $(ls -d ./incoming/${{ matrix.package }}-*)
114114
# For stylish-haskell
@@ -133,7 +133,7 @@ jobs:
133133
cabal haddock --haddock-for-hackage
134134
135135
- name: "Upload package dist tarball"
136-
if: steps.get-hackage-version.outputs.exists != 'true' && matrix.ghc == '8.10.7'
136+
if: steps.get-hackage-version.outputs.exists != 'true' && matrix.ghc == '8.10'
137137
uses: actions/upload-artifact@v3
138138
with:
139139
name: ${{ matrix.package }}

.github/workflows/pre-commit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: ./.github/actions/setup-build
2828
with:
2929
# select a stable GHC version
30-
ghc: 9.2.7
30+
ghc: 9.2
3131
os: ${{ runner.os }}
3232
shorten-hls: false
3333

0 commit comments

Comments
 (0)