Skip to content

Commit 6d1a5ef

Browse files
phadejphadej
authored
Merge pull request #751 from haskell-CI/setup-method-tests
Setup method tests
2 parents 698fbb8 + 73d9eeb commit 6d1a5ef

24 files changed

+484
-320
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
- name: cache (tools)
182182
uses: actions/cache/restore@v4
183183
with:
184-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-c0a7f8fa
184+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-1e9b3b69
185185
path: ~/.haskell-ci-tools
186186
- name: install cabal-plan
187187
run: |
@@ -209,7 +209,7 @@ jobs:
209209
if: always()
210210
uses: actions/cache/save@v4
211211
with:
212-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-c0a7f8fa
212+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-1e9b3b69
213213
path: ~/.haskell-ci-tools
214214
- name: checkout
215215
uses: actions/checkout@v4

‎fixtures/all-versions.github‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -253,32 +253,52 @@ jobs:
253253
compilerVersion: 8.6.1
254254
setup-method: ghcup
255255
allow-failure: false
256+
- compiler: ghc-8.4.4
257+
compilerKind: ghc
258+
compilerVersion: 8.4.4
259+
setup-method: ghcup
260+
allow-failure: false
261+
- compiler: ghc-8.4.3
262+
compilerKind: ghc
263+
compilerVersion: 8.4.3
264+
setup-method: ghcup
265+
allow-failure: false
266+
- compiler: ghc-8.4.2
267+
compilerKind: ghc
268+
compilerVersion: 8.4.2
269+
setup-method: ghcup
270+
allow-failure: false
271+
- compiler: ghc-8.4.1
272+
compilerKind: ghc
273+
compilerVersion: 8.4.1
274+
setup-method: ghcup
275+
allow-failure: false
256276
- compiler: ghc-8.2.2
257277
compilerKind: ghc
258278
compilerVersion: 8.2.2
259-
setup-method: hvr-ppa
279+
setup-method: ghcup
260280
allow-failure: false
261281
- compiler: ghc-8.2.1
262282
compilerKind: ghc
263283
compilerVersion: 8.2.1
264-
setup-method: hvr-ppa
284+
setup-method: ghcup
265285
allow-failure: false
266286
- compiler: ghc-8.0.2
267287
compilerKind: ghc
268288
compilerVersion: 8.0.2
269-
setup-method: hvr-ppa
289+
setup-method: ghcup
270290
allow-failure: false
271291
- compiler: ghc-8.0.1
272292
compilerKind: ghc
273293
compilerVersion: 8.0.1
274-
setup-method: hvr-ppa
294+
setup-method: ghcup
275295
allow-failure: false
276296
fail-fast: false
277297
steps:
278298
- name: apt-get install
279299
run: |
280300
apt-get update
281-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
301+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
282302
- name: Install GHCup
283303
run: |
284304
mkdir -p "$HOME/.ghcup/bin"
@@ -288,20 +308,6 @@ jobs:
288308
run: |
289309
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
290310
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
291-
- name: Install GHC (hvr-ppa)
292-
if: matrix.setup-method == 'hvr-ppa'
293-
run: |
294-
apt-add-repository -y 'ppa:hvr/ghc'
295-
apt-get update
296-
apt-get install -y "$HCNAME"
297-
HC=$HCDIR/bin/$HCKIND
298-
echo "HC=$HC" >> "$GITHUB_ENV"
299-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
300-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
301-
env:
302-
HCKIND: ${{ matrix.compilerKind }}
303-
HCNAME: ${{ matrix.compiler }}
304-
HCVER: ${{ matrix.compilerVersion }}
305311
- name: Install GHC (GHCup)
306312
if: matrix.setup-method == 'ghcup'
307313
run: |

‎fixtures/copy-fields-all.github‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -108,32 +108,52 @@ jobs:
108108
compilerVersion: 8.6.1
109109
setup-method: ghcup
110110
allow-failure: false
111+
- compiler: ghc-8.4.4
112+
compilerKind: ghc
113+
compilerVersion: 8.4.4
114+
setup-method: ghcup
115+
allow-failure: false
116+
- compiler: ghc-8.4.3
117+
compilerKind: ghc
118+
compilerVersion: 8.4.3
119+
setup-method: ghcup
120+
allow-failure: false
121+
- compiler: ghc-8.4.2
122+
compilerKind: ghc
123+
compilerVersion: 8.4.2
124+
setup-method: ghcup
125+
allow-failure: false
126+
- compiler: ghc-8.4.1
127+
compilerKind: ghc
128+
compilerVersion: 8.4.1
129+
setup-method: ghcup
130+
allow-failure: false
111131
- compiler: ghc-8.2.2
112132
compilerKind: ghc
113133
compilerVersion: 8.2.2
114-
setup-method: hvr-ppa
134+
setup-method: ghcup
115135
allow-failure: false
116136
- compiler: ghc-8.2.1
117137
compilerKind: ghc
118138
compilerVersion: 8.2.1
119-
setup-method: hvr-ppa
139+
setup-method: ghcup
120140
allow-failure: false
121141
- compiler: ghc-8.0.2
122142
compilerKind: ghc
123143
compilerVersion: 8.0.2
124-
setup-method: hvr-ppa
144+
setup-method: ghcup
125145
allow-failure: false
126146
- compiler: ghc-8.0.1
127147
compilerKind: ghc
128148
compilerVersion: 8.0.1
129-
setup-method: hvr-ppa
149+
setup-method: ghcup
130150
allow-failure: false
131151
fail-fast: false
132152
steps:
133153
- name: apt-get install
134154
run: |
135155
apt-get update
136-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
156+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
137157
- name: Install GHCup
138158
run: |
139159
mkdir -p "$HOME/.ghcup/bin"
@@ -143,20 +163,6 @@ jobs:
143163
run: |
144164
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
145165
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
146-
- name: Install GHC (hvr-ppa)
147-
if: matrix.setup-method == 'hvr-ppa'
148-
run: |
149-
apt-add-repository -y 'ppa:hvr/ghc'
150-
apt-get update
151-
apt-get install -y "$HCNAME"
152-
HC=$HCDIR/bin/$HCKIND
153-
echo "HC=$HC" >> "$GITHUB_ENV"
154-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
155-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
156-
env:
157-
HCKIND: ${{ matrix.compilerKind }}
158-
HCNAME: ${{ matrix.compiler }}
159-
HCVER: ${{ matrix.compilerVersion }}
160166
- name: Install GHC (GHCup)
161167
if: matrix.setup-method == 'ghcup'
162168
run: |

‎fixtures/copy-fields-none.github‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -108,32 +108,52 @@ jobs:
108108
compilerVersion: 8.6.1
109109
setup-method: ghcup
110110
allow-failure: false
111+
- compiler: ghc-8.4.4
112+
compilerKind: ghc
113+
compilerVersion: 8.4.4
114+
setup-method: ghcup
115+
allow-failure: false
116+
- compiler: ghc-8.4.3
117+
compilerKind: ghc
118+
compilerVersion: 8.4.3
119+
setup-method: ghcup
120+
allow-failure: false
121+
- compiler: ghc-8.4.2
122+
compilerKind: ghc
123+
compilerVersion: 8.4.2
124+
setup-method: ghcup
125+
allow-failure: false
126+
- compiler: ghc-8.4.1
127+
compilerKind: ghc
128+
compilerVersion: 8.4.1
129+
setup-method: ghcup
130+
allow-failure: false
111131
- compiler: ghc-8.2.2
112132
compilerKind: ghc
113133
compilerVersion: 8.2.2
114-
setup-method: hvr-ppa
134+
setup-method: ghcup
115135
allow-failure: false
116136
- compiler: ghc-8.2.1
117137
compilerKind: ghc
118138
compilerVersion: 8.2.1
119-
setup-method: hvr-ppa
139+
setup-method: ghcup
120140
allow-failure: false
121141
- compiler: ghc-8.0.2
122142
compilerKind: ghc
123143
compilerVersion: 8.0.2
124-
setup-method: hvr-ppa
144+
setup-method: ghcup
125145
allow-failure: false
126146
- compiler: ghc-8.0.1
127147
compilerKind: ghc
128148
compilerVersion: 8.0.1
129-
setup-method: hvr-ppa
149+
setup-method: ghcup
130150
allow-failure: false
131151
fail-fast: false
132152
steps:
133153
- name: apt-get install
134154
run: |
135155
apt-get update
136-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
156+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
137157
- name: Install GHCup
138158
run: |
139159
mkdir -p "$HOME/.ghcup/bin"
@@ -143,20 +163,6 @@ jobs:
143163
run: |
144164
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
145165
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
146-
- name: Install GHC (hvr-ppa)
147-
if: matrix.setup-method == 'hvr-ppa'
148-
run: |
149-
apt-add-repository -y 'ppa:hvr/ghc'
150-
apt-get update
151-
apt-get install -y "$HCNAME"
152-
HC=$HCDIR/bin/$HCKIND
153-
echo "HC=$HC" >> "$GITHUB_ENV"
154-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
155-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
156-
env:
157-
HCKIND: ${{ matrix.compilerKind }}
158-
HCNAME: ${{ matrix.compiler }}
159-
HCVER: ${{ matrix.compilerVersion }}
160166
- name: Install GHC (GHCup)
161167
if: matrix.setup-method == 'ghcup'
162168
run: |

‎fixtures/copy-fields-some.github‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -108,32 +108,52 @@ jobs:
108108
compilerVersion: 8.6.1
109109
setup-method: ghcup
110110
allow-failure: false
111+
- compiler: ghc-8.4.4
112+
compilerKind: ghc
113+
compilerVersion: 8.4.4
114+
setup-method: ghcup
115+
allow-failure: false
116+
- compiler: ghc-8.4.3
117+
compilerKind: ghc
118+
compilerVersion: 8.4.3
119+
setup-method: ghcup
120+
allow-failure: false
121+
- compiler: ghc-8.4.2
122+
compilerKind: ghc
123+
compilerVersion: 8.4.2
124+
setup-method: ghcup
125+
allow-failure: false
126+
- compiler: ghc-8.4.1
127+
compilerKind: ghc
128+
compilerVersion: 8.4.1
129+
setup-method: ghcup
130+
allow-failure: false
111131
- compiler: ghc-8.2.2
112132
compilerKind: ghc
113133
compilerVersion: 8.2.2
114-
setup-method: hvr-ppa
134+
setup-method: ghcup
115135
allow-failure: false
116136
- compiler: ghc-8.2.1
117137
compilerKind: ghc
118138
compilerVersion: 8.2.1
119-
setup-method: hvr-ppa
139+
setup-method: ghcup
120140
allow-failure: false
121141
- compiler: ghc-8.0.2
122142
compilerKind: ghc
123143
compilerVersion: 8.0.2
124-
setup-method: hvr-ppa
144+
setup-method: ghcup
125145
allow-failure: false
126146
- compiler: ghc-8.0.1
127147
compilerKind: ghc
128148
compilerVersion: 8.0.1
129-
setup-method: hvr-ppa
149+
setup-method: ghcup
130150
allow-failure: false
131151
fail-fast: false
132152
steps:
133153
- name: apt-get install
134154
run: |
135155
apt-get update
136-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
156+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
137157
- name: Install GHCup
138158
run: |
139159
mkdir -p "$HOME/.ghcup/bin"
@@ -143,20 +163,6 @@ jobs:
143163
run: |
144164
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
145165
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
146-
- name: Install GHC (hvr-ppa)
147-
if: matrix.setup-method == 'hvr-ppa'
148-
run: |
149-
apt-add-repository -y 'ppa:hvr/ghc'
150-
apt-get update
151-
apt-get install -y "$HCNAME"
152-
HC=$HCDIR/bin/$HCKIND
153-
echo "HC=$HC" >> "$GITHUB_ENV"
154-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
155-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
156-
env:
157-
HCKIND: ${{ matrix.compilerKind }}
158-
HCNAME: ${{ matrix.compiler }}
159-
HCVER: ${{ matrix.compilerVersion }}
160166
- name: Install GHC (GHCup)
161167
if: matrix.setup-method == 'ghcup'
162168
run: |

0 commit comments

Comments
 (0)