From e94b11da8cb52539a3c4c91bec996287a2a6207e Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Fri, 29 Dec 2023 21:35:54 +0000 Subject: [PATCH] Bump CI and stack.yaml files --- .github/workflows/ci.yml | 25 +++++++++++++------- ansi-terminal-types/stack.yaml | 4 +--- ansi-terminal/stack.yaml | 4 +--- stack-ghc-9.4.5.yaml => stack-ghc-9.4.8.yaml | 2 +- stack-winio.yaml | 2 +- stack.yaml | 2 +- 6 files changed, 21 insertions(+), 18 deletions(-) rename stack-ghc-9.4.5.yaml => stack-ghc-9.4.8.yaml (68%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b1dfc3..8066bc3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,13 +23,15 @@ jobs: - "8.8.4" - "8.10.7" - "9.0.2" - - "9.2.7" - - "9.4.5" + - "9.2.8" + - "9.4.8" include: - - ghc: "9.6.1" - cabal: "3.10" + - ghc: "9.6.3" + cabal: "3.10" + - ghc: "9.8.1" + cabal: "3.10" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: haskell/actions/setup@v2 id: setup-haskell-cabal with: @@ -66,15 +68,20 @@ jobs: - ghc: "9.0.2" cabal: "3.8" winio: true - - ghc: "9.2.7" + - ghc: "9.2.8" cabal: "3.8" winio: true - - ghc: "9.4.5" + - ghc: "9.4.8" cabal: "3.8" - - ghc: "9.6.1" + winio: true + - ghc: "9.6.3" cabal: "3.10" + winio: true + - ghc: "9.8.1" + cabal: "3.10" + winio: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: haskell/actions/setup@v2 id: setup-haskell-cabal with: diff --git a/ansi-terminal-types/stack.yaml b/ansi-terminal-types/stack.yaml index 3eaafe5..ab57da5 100644 --- a/ansi-terminal-types/stack.yaml +++ b/ansi-terminal-types/stack.yaml @@ -1,3 +1 @@ -resolver: lts-20.20 # GHC 9.2.7 -packages: -- . +resolver: lts-22.3 # GHC 9.6.3 diff --git a/ansi-terminal/stack.yaml b/ansi-terminal/stack.yaml index 0d489f6..e6cf5dd 100644 --- a/ansi-terminal/stack.yaml +++ b/ansi-terminal/stack.yaml @@ -1,8 +1,6 @@ -resolver: lts-20.20 # GHC 9.2.7 +resolver: lts-22.3 # GHC 9.6.3 flags: ansi-terminal: example: false -packages: -- . extra-deps: - ansi-terminal-types-0.11.5@sha256:f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a,1482 diff --git a/stack-ghc-9.4.5.yaml b/stack-ghc-9.4.8.yaml similarity index 68% rename from stack-ghc-9.4.5.yaml rename to stack-ghc-9.4.8.yaml index 22c7d2b..ed91a53 100644 --- a/stack-ghc-9.4.5.yaml +++ b/stack-ghc-9.4.8.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2023-05-13 # GHC 9.4.5 +resolver: lts-21.25 # GHC 9.4.8 flags: ansi-terminal: example: false diff --git a/stack-winio.yaml b/stack-winio.yaml index f469b53..210eee1 100644 --- a/stack-winio.yaml +++ b/stack-winio.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.20 # GHC 9.2.7 +resolver: lts-22.3 # GHC 9.6.3 flags: ansi-terminal: example: false diff --git a/stack.yaml b/stack.yaml index 754bc4e..970fb67 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-20.20 # GHC 9.2.7 +resolver: lts-22.3 # GHC 9.6.3 flags: ansi-terminal: example: false