From 1184654692dbe248264a51e656cf428c071e9ecb Mon Sep 17 00:00:00 2001 From: Ashley Yakeley Date: Wed, 28 Feb 2024 12:50:29 -0800 Subject: [PATCH] update GHC versions --- .github/workflows/ci.yml | 4 ++-- fullcheck | 2 +- fullcheck.ps1 | 2 +- stack.yaml | 2 +- stack.yaml.lock | 28 ++++++++++++++-------------- time.cabal | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10419876..e1d94b17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macOS-latest] - ghc: ['9.8.1', '9.6.3', '9.4.8'] + ghc: ['9.8.2', '9.6.4', '9.4.8'] steps: - uses: actions/checkout@v4 - uses: haskell-actions/setup@v2 @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.8.1', '9.6.3', '9.4.8'] + ghc: ['9.8.2', '9.6.4', '9.4.8'] steps: - uses: actions/checkout@v4 - uses: haskell-actions/setup@v2 diff --git a/fullcheck b/fullcheck index ea76ead4..9b47e2c6 100755 --- a/fullcheck +++ b/fullcheck @@ -6,7 +6,7 @@ PATH=$HOME/.ghcup/bin:$PATH ghcup upgrade ghcup install cabal latest ghcup set cabal latest -for c in 9.4.8 9.6.3 9.8.1 +for c in 9.4.8 9.6.4 9.8.2 do ghcup install ghc $c ghcup set ghc $c diff --git a/fullcheck.ps1 b/fullcheck.ps1 index 634e3178..4dfe7681 100644 --- a/fullcheck.ps1 +++ b/fullcheck.ps1 @@ -11,7 +11,7 @@ if (!$?) {Exit 1} if (!$?) {Exit 1} & "ghcup" "set" "cabal" "latest" if (!$?) {Exit 1} -ForEach ($c in "9.4.8","9.6.3","9.8.1") +ForEach ($c in "9.4.8","9.6.4","9.8.2") { & "ghcup" "install" "ghc" "$c" if (!$?) {Exit 1} diff --git a/stack.yaml b/stack.yaml index 166ee0ed..13dc31c6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-19.6 +resolver: lts-22.12 packages: - '.' allow-newer: true diff --git a/stack.yaml.lock b/stack.yaml.lock index c8a0b89c..54451e3e 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -7,52 +7,52 @@ packages: - completed: hackage: process-1.6.13.2@sha256:a6530a5698796e29d85817f74ca3ae20d2172fb9fa52b492c2e6816e1306bfe8,2963 pantry-tree: - size: 1543 sha256: 045d10d710f046aa69ab3dd3f425b9479820809d6c3ca1596e0b995bcf49ac7a + size: 1543 original: hackage: process-1.6.13.2 - completed: hackage: unix-2.7.2.2@sha256:15f5365c5995634e45de1772b9504761504a310184e676bc2ef60a14536dbef9,3496 pantry-tree: - size: 3536 sha256: 36434ced74d679622d61b69e8d92e1bd632d9ef3e284c63094653b2e473b0553 + size: 3536 original: hackage: unix-2.7.2.2 - completed: hackage: directory-1.3.7.0@sha256:4d59f9714700e69d139084b47204fc91f13f31546aac39d666279996192b0d11,2940 pantry-tree: - size: 3433 sha256: 88b74942886e886b22ac1f3f0f65168563df4848766f372aaf014f712d3abb9a + size: 3433 original: hackage: directory-1.3.7.0 - completed: hackage: Cabal-3.6.2.0@sha256:e2266e14758c1f799220fad7f0d4b0b4ec567d81b7ba3faea17ff76d4c31de95,12437 pantry-tree: - size: 19757 sha256: 6650e54cbbcda6d05c4d8b8094fa61e5ffbda15a798a354d2dad5b35dc3b2859 + size: 19757 original: hackage: Cabal-3.6.2.0 - completed: hackage: ghc-lib-parser-9.2.1.20211101@sha256:c7f5649391acb4ceec6770acce3b77dea8aad3fd442b2a32a1d0dbaede080c0b,12705 pantry-tree: - size: 27578 sha256: 445b7dd1908b8187dfdab87673a68f1ca42e2bcfd7dd68f04a3ad91a2215e3e2 + size: 27578 original: hackage: ghc-lib-parser-9.2.1.20211101 - completed: - name: fourmolu - version: 0.5.0.1 + commit: 3b62452795ac8029f7f645f834e74737a355bd14 git: https://github.com/AshleyYakeley/fourmolu.git + name: fourmolu pantry-tree: - size: 128923 sha256: 20ce0b8c5a8a591497162afdd85cd88faa87b4c98eb93c91eb0c6f9672c87a42 - commit: 3b62452795ac8029f7f645f834e74737a355bd14 + size: 128923 + version: 0.5.0.1 original: - git: https://github.com/AshleyYakeley/fourmolu.git commit: 3b62452795ac8029f7f645f834e74737a355bd14 + git: https://github.com/AshleyYakeley/fourmolu.git snapshots: - completed: - size: 618876 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/6.yaml - sha256: fb634b19f31da06684bb07ce02a20c75a3162138f279b388905b03ebd57bb50f - original: lts-19.6 + sha256: e2c529ccfb21501f98f639e056cbde50470b86256d9849d7a82d414ca23e4276 + size: 712898 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/12.yaml + original: lts-22.12 diff --git a/time.cabal b/time.cabal index e5950406..96573a09 100644 --- a/time.cabal +++ b/time.cabal @@ -14,8 +14,8 @@ category: Time build-type: Configure tested-with: GHC == 9.4.8, - GHC == 9.6.3, - GHC == 9.8.1 + GHC == 9.6.4, + GHC == 9.8.2 x-follows-version-policy: extra-source-files: