Skip to content

Commit 7de74fd

Browse files
authored
Merge pull request #774 from haskell-CI/ghc-9.6.7
Add GHC-9.6.7
2 parents 0b2b0bd + 7fddc85 commit 7de74fd

26 files changed

+79
-35
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
compilerVersion: 9.8.4
4141
setup-method: ghcup
4242
allow-failure: false
43-
- compiler: ghc-9.6.6
43+
- compiler: ghc-9.6.7
4444
compilerKind: ghc
45-
compilerVersion: 9.6.6
45+
compilerVersion: 9.6.7
4646
setup-method: ghcup
4747
allow-failure: false
4848
- compiler: ghc-9.4.8
@@ -84,7 +84,7 @@ jobs:
8484
- name: Install GHCup
8585
run: |
8686
mkdir -p "$HOME/.ghcup/bin"
87-
curl -sL https://downloads.haskell.org/ghcup/0.1.40.0/x86_64-linux-ghcup-0.1.40.0 > "$HOME/.ghcup/bin/ghcup"
87+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
8888
chmod a+x "$HOME/.ghcup/bin/ghcup"
8989
- name: Install cabal-install
9090
run: |

cabal-install-parsers/cabal-install-parsers.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ tested-with:
3131
|| ==9.0.2
3232
|| ==9.2.8
3333
|| ==9.4.8
34-
|| ==9.6.6
34+
|| ==9.6.7
3535
|| ==9.8.4
3636
|| ==9.10.1
3737

fixtures/all-versions.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SUCCESS
2-
# *INFO* Generating Bash script for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.1 9.4.2 9.4.3 9.4.4 9.4.5 9.4.6 9.4.7 9.4.8 9.6.1 9.6.2 9.6.3 9.6.4 9.6.5 9.6.6 9.8.1 9.8.2 9.8.3 9.8.4 9.10.1 9.12.1 9.12.2 ghcjs-8.4
2+
# *INFO* Generating Bash script for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.1 9.4.2 9.4.3 9.4.4 9.4.5 9.4.6 9.4.7 9.4.8 9.6.1 9.6.2 9.6.3 9.6.4 9.6.5 9.6.6 9.6.7 9.8.1 9.8.2 9.8.3 9.8.4 9.10.1 9.12.1 9.12.2 ghcjs-8.4
33
#!/bin/bash
44
# shellcheck disable=SC2086,SC2016,SC2046
55
# REGENDATA ["bash","all-versions.project"]
@@ -21,7 +21,7 @@ fi
2121

2222
CFG_CABAL_STORE_CACHE=""
2323
CFG_CABAL_REPO_CACHE=""
24-
CFG_JOBS="9.12.2 9.12.1 9.10.1 9.8.4 9.8.3 9.8.2 9.8.1 9.6.6 9.6.5 9.6.4 9.6.3 9.6.2 9.6.1 9.4.8 9.4.7 9.4.6 9.4.5 9.4.4 9.4.3 9.4.2 9.4.1 9.2.8 9.2.7 9.2.6 9.2.5 9.2.4 9.2.3 9.2.2 9.2.1 9.0.2 9.0.1 8.10.7 8.10.6 8.10.5 8.10.4 8.10.3 8.10.2 8.10.1 8.8.4 8.8.3 8.8.2 8.8.1 8.6.5 8.6.4 8.6.3 8.6.2 8.6.1 8.4.4 8.4.3 8.4.2 8.4.1 8.2.2 8.2.1 8.0.2 8.0.1"
24+
CFG_JOBS="9.12.2 9.12.1 9.10.1 9.8.4 9.8.3 9.8.2 9.8.1 9.6.7 9.6.6 9.6.5 9.6.4 9.6.3 9.6.2 9.6.1 9.4.8 9.4.7 9.4.6 9.4.5 9.4.4 9.4.3 9.4.2 9.4.1 9.2.8 9.2.7 9.2.6 9.2.5 9.2.4 9.2.3 9.2.2 9.2.1 9.0.2 9.0.1 8.10.7 8.10.6 8.10.5 8.10.4 8.10.3 8.10.2 8.10.1 8.8.4 8.8.3 8.8.2 8.8.1 8.6.5 8.6.4 8.6.3 8.6.2 8.6.1 8.4.4 8.4.3 8.4.2 8.4.1 8.2.2 8.2.1 8.0.2 8.0.1"
2525
CFG_CABAL_UPDATE=false
2626

2727
SCRIPT_NAME=$(basename "$0")

fixtures/all-versions.github

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SUCCESS
2-
# *INFO* Generating GitHub config for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.1 9.4.2 9.4.3 9.4.4 9.4.5 9.4.6 9.4.7 9.4.8 9.6.1 9.6.2 9.6.3 9.6.4 9.6.5 9.6.6 9.8.1 9.8.2 9.8.3 9.8.4 9.10.1 9.12.1 9.12.2 ghcjs-8.4
2+
# *INFO* Generating GitHub config for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.1 9.4.2 9.4.3 9.4.4 9.4.5 9.4.6 9.4.7 9.4.8 9.6.1 9.6.2 9.6.3 9.6.4 9.6.5 9.6.6 9.6.7 9.8.1 9.8.2 9.8.3 9.8.4 9.10.1 9.12.1 9.12.2 ghcjs-8.4
33
# This GitHub workflow config has been generated by a script via
44
#
55
# haskell-ci 'github' 'all-versions.project'
@@ -63,6 +63,11 @@ jobs:
6363
compilerVersion: 9.8.1
6464
setup-method: ghcup
6565
allow-failure: false
66+
- compiler: ghc-9.6.7
67+
compilerKind: ghc
68+
compilerVersion: 9.6.7
69+
setup-method: ghcup
70+
allow-failure: false
6671
- compiler: ghc-9.6.6
6772
compilerKind: ghc
6873
compilerVersion: 9.6.6
@@ -312,7 +317,7 @@ jobs:
312317
- name: Install GHCup
313318
run: |
314319
mkdir -p "$HOME/.ghcup/bin"
315-
curl -sL https://downloads.haskell.org/ghcup/0.1.40.0/x86_64-linux-ghcup-0.1.40.0 > "$HOME/.ghcup/bin/ghcup"
320+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
316321
chmod a+x "$HOME/.ghcup/bin/ghcup"
317322
- name: Install cabal-install
318323
run: |

fixtures/copy-fields-all.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
- name: Install GHCup
158158
run: |
159159
mkdir -p "$HOME/.ghcup/bin"
160-
curl -sL https://downloads.haskell.org/ghcup/0.1.40.0/x86_64-linux-ghcup-0.1.40.0 > "$HOME/.ghcup/bin/ghcup"
160+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162162
- name: Install cabal-install
163163
run: |

fixtures/copy-fields-none.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
- name: Install GHCup
158158
run: |
159159
mkdir -p "$HOME/.ghcup/bin"
160-
curl -sL https://downloads.haskell.org/ghcup/0.1.40.0/x86_64-linux-ghcup-0.1.40.0 > "$HOME/.ghcup/bin/ghcup"
160+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162162
- name: Install cabal-install
163163
run: |

fixtures/copy-fields-some.github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
- name: Install GHCup
158158
run: |
159159
mkdir -p "$HOME/.ghcup/bin"
160-
curl -sL https://downloads.haskell.org/ghcup/0.1.40.0/x86_64-linux-ghcup-0.1.40.0 > "$HOME/.ghcup/bin/ghcup"
160+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
161161
chmod a+x "$HOME/.ghcup/bin/ghcup"
162162
- name: Install cabal-install
163163
run: |

fixtures/doctest-version.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SUCCESS
2-
# *INFO* Generating Bash script for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.1 9.4.2 9.4.3 9.4.4 9.4.5 9.4.6 9.4.7 9.4.8 9.6.1 9.6.2 9.6.3 9.6.4 9.6.5 9.6.6 9.8.1 9.8.2 9.8.3 9.8.4 9.10.1 9.12.1 9.12.2 ghcjs-8.4
2+
# *INFO* Generating Bash script for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.1 9.4.2 9.4.3 9.4.4 9.4.5 9.4.6 9.4.7 9.4.8 9.6.1 9.6.2 9.6.3 9.6.4 9.6.5 9.6.6 9.6.7 9.8.1 9.8.2 9.8.3 9.8.4 9.10.1 9.12.1 9.12.2 ghcjs-8.4
33
#!/bin/bash
44
# shellcheck disable=SC2086,SC2016,SC2046
55
# REGENDATA ["--doctest","--doctest-version=^>=0.20","bash","doctest-version.project"]
@@ -21,7 +21,7 @@ fi
2121

2222
CFG_CABAL_STORE_CACHE=""
2323
CFG_CABAL_REPO_CACHE=""
24-
CFG_JOBS="9.12.2 9.12.1 9.10.1 9.8.4 9.8.3 9.8.2 9.8.1 9.6.6 9.6.5 9.6.4 9.6.3 9.6.2 9.6.1 9.4.8 9.4.7 9.4.6 9.4.5 9.4.4 9.4.3 9.4.2 9.4.1 9.2.8 9.2.7 9.2.6 9.2.5 9.2.4 9.2.3 9.2.2 9.2.1 9.0.2 9.0.1 8.10.7 8.10.6 8.10.5 8.10.4 8.10.3 8.10.2 8.10.1 8.8.4 8.8.3 8.8.2 8.8.1 8.6.5 8.6.4 8.6.3 8.6.2 8.6.1 8.4.4 8.4.3 8.4.2 8.4.1 8.2.2 8.2.1 8.0.2 8.0.1"
24+
CFG_JOBS="9.12.2 9.12.1 9.10.1 9.8.4 9.8.3 9.8.2 9.8.1 9.6.7 9.6.6 9.6.5 9.6.4 9.6.3 9.6.2 9.6.1 9.4.8 9.4.7 9.4.6 9.4.5 9.4.4 9.4.3 9.4.2 9.4.1 9.2.8 9.2.7 9.2.6 9.2.5 9.2.4 9.2.3 9.2.2 9.2.1 9.0.2 9.0.1 8.10.7 8.10.6 8.10.5 8.10.4 8.10.3 8.10.2 8.10.1 8.8.4 8.8.3 8.8.2 8.8.1 8.6.5 8.6.4 8.6.3 8.6.2 8.6.1 8.4.4 8.4.3 8.4.2 8.4.1 8.2.2 8.2.1 8.0.2 8.0.1"
2525
CFG_CABAL_UPDATE=false
2626

2727
SCRIPT_NAME=$(basename "$0")

fixtures/doctest-version.github

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SUCCESS
2-
# *INFO* Generating GitHub config for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.1 9.4.2 9.4.3 9.4.4 9.4.5 9.4.6 9.4.7 9.4.8 9.6.1 9.6.2 9.6.3 9.6.4 9.6.5 9.6.6 9.8.1 9.8.2 9.8.3 9.8.4 9.10.1 9.12.1 9.12.2 ghcjs-8.4
2+
# *INFO* Generating GitHub config for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.1 9.4.2 9.4.3 9.4.4 9.4.5 9.4.6 9.4.7 9.4.8 9.6.1 9.6.2 9.6.3 9.6.4 9.6.5 9.6.6 9.6.7 9.8.1 9.8.2 9.8.3 9.8.4 9.10.1 9.12.1 9.12.2 ghcjs-8.4
33
# This GitHub workflow config has been generated by a script via
44
#
55
# haskell-ci '--doctest' '--doctest-version=^>=0.20' 'github' 'doctest-version.project'
@@ -63,6 +63,11 @@ jobs:
6363
compilerVersion: 9.8.1
6464
setup-method: ghcup
6565
allow-failure: false
66+
- compiler: ghc-9.6.7
67+
compilerKind: ghc
68+
compilerVersion: 9.6.7
69+
setup-method: ghcup
70+
allow-failure: false
6671
- compiler: ghc-9.6.6
6772
compilerKind: ghc
6873
compilerVersion: 9.6.6
@@ -312,7 +317,7 @@ jobs:
312317
- name: Install GHCup
313318
run: |
314319
mkdir -p "$HOME/.ghcup/bin"
315-
curl -sL https://downloads.haskell.org/ghcup/0.1.40.0/x86_64-linux-ghcup-0.1.40.0 > "$HOME/.ghcup/bin/ghcup"
320+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
316321
chmod a+x "$HOME/.ghcup/bin/ghcup"
317322
- name: Install cabal-install
318323
run: |

fixtures/doctest.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SUCCESS
2-
# *INFO* Generating Bash script for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.1 9.4.2 9.4.3 9.4.4 9.4.5 9.4.6 9.4.7 9.4.8 9.6.1 9.6.2 9.6.3 9.6.4 9.6.5 9.6.6 9.8.1 9.8.2 9.8.3 9.8.4 9.10.1 9.12.1 9.12.2 ghcjs-8.4
2+
# *INFO* Generating Bash script for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.1 9.4.2 9.4.3 9.4.4 9.4.5 9.4.6 9.4.7 9.4.8 9.6.1 9.6.2 9.6.3 9.6.4 9.6.5 9.6.6 9.6.7 9.8.1 9.8.2 9.8.3 9.8.4 9.10.1 9.12.1 9.12.2 ghcjs-8.4
33
#!/bin/bash
44
# shellcheck disable=SC2086,SC2016,SC2046
55
# REGENDATA ["--doctest","bash","doctest.project"]
@@ -21,7 +21,7 @@ fi
2121

2222
CFG_CABAL_STORE_CACHE=""
2323
CFG_CABAL_REPO_CACHE=""
24-
CFG_JOBS="9.12.2 9.12.1 9.10.1 9.8.4 9.8.3 9.8.2 9.8.1 9.6.6 9.6.5 9.6.4 9.6.3 9.6.2 9.6.1 9.4.8 9.4.7 9.4.6 9.4.5 9.4.4 9.4.3 9.4.2 9.4.1 9.2.8 9.2.7 9.2.6 9.2.5 9.2.4 9.2.3 9.2.2 9.2.1 9.0.2 9.0.1 8.10.7 8.10.6 8.10.5 8.10.4 8.10.3 8.10.2 8.10.1 8.8.4 8.8.3 8.8.2 8.8.1 8.6.5 8.6.4 8.6.3 8.6.2 8.6.1 8.4.4 8.4.3 8.4.2 8.4.1 8.2.2 8.2.1 8.0.2 8.0.1"
24+
CFG_JOBS="9.12.2 9.12.1 9.10.1 9.8.4 9.8.3 9.8.2 9.8.1 9.6.7 9.6.6 9.6.5 9.6.4 9.6.3 9.6.2 9.6.1 9.4.8 9.4.7 9.4.6 9.4.5 9.4.4 9.4.3 9.4.2 9.4.1 9.2.8 9.2.7 9.2.6 9.2.5 9.2.4 9.2.3 9.2.2 9.2.1 9.0.2 9.0.1 8.10.7 8.10.6 8.10.5 8.10.4 8.10.3 8.10.2 8.10.1 8.8.4 8.8.3 8.8.2 8.8.1 8.6.5 8.6.4 8.6.3 8.6.2 8.6.1 8.4.4 8.4.3 8.4.2 8.4.1 8.2.2 8.2.1 8.0.2 8.0.1"
2525
CFG_CABAL_UPDATE=false
2626

2727
SCRIPT_NAME=$(basename "$0")

0 commit comments

Comments
 (0)