Skip to content

Commit

Permalink
Update golden tests
Browse files Browse the repository at this point in the history
  • Loading branch information
noughtmare committed Aug 10, 2023
1 parent 1a84038 commit d50b371
Show file tree
Hide file tree
Showing 26 changed files with 97 additions and 19 deletions.
15 changes: 15 additions & 0 deletions summoner-cli/examples/cabal-full/.github/workflows/ci.yml
Expand Up @@ -23,7 +23,16 @@ jobs:
- "8.8.4"
- "8.10.7"
- "9.0.2"
- "9.2.8"
- "9.4.5"
- "9.6.2"
exclude:
- os: macOS-latest
ghc: 9.4.5
- os: macOS-latest
ghc: 9.2.8
- os: macOS-latest
ghc: 9.0.2
- os: macOS-latest
ghc: 8.10.7
- os: macOS-latest
Expand All @@ -32,6 +41,12 @@ jobs:
ghc: 8.6.5
- os: macOS-latest
ghc: 8.4.4
- os: windows-latest
ghc: 9.4.5
- os: windows-latest
ghc: 9.2.8
- os: windows-latest
ghc: 9.0.2
- os: windows-latest
ghc: 8.10.7
- os: windows-latest
Expand Down
3 changes: 3 additions & 0 deletions summoner-cli/examples/cabal-full/.travis.yml
Expand Up @@ -16,6 +16,9 @@ jobs:
- ghc: 8.8.4
- ghc: 8.10.7
- ghc: 9.0.2
- ghc: 9.2.8
- ghc: 9.4.5
- ghc: 9.6.2

install:
# HLint check
Expand Down
4 changes: 2 additions & 2 deletions summoner-cli/examples/cabal-full/appveyor.yml
Expand Up @@ -21,12 +21,12 @@ environment:
CABOPTS: --store-dir=C:\\SR

matrix:
- GHCVER: 9.0.2
- GHCVER: 9.6.2

install:
- choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
- choco install -y cabal --version 3.6.2.0
- choco install -y ghc --version 9.0.2
- choco install -y ghc --version 9.6.2
- refreshenv

before_build:
Expand Down
5 changes: 4 additions & 1 deletion summoner-cli/examples/cabal-full/cabal-full.cabal
Expand Up @@ -21,13 +21,16 @@ tested-with: GHC == 8.4.4
GHC == 8.8.4
GHC == 8.10.7
GHC == 9.0.2
GHC == 9.2.8
GHC == 9.4.5
GHC == 9.6.2

source-repository head
type: git
location: https://github.com/kowainik/cabal-full.git

common common-options
build-depends: base >= 4.11.1.0 && < 4.16
build-depends: base >= 4.11.1.0 && < 4.19
, relude

mixins: base hiding (Prelude)
Expand Down
4 changes: 2 additions & 2 deletions summoner-cli/examples/cabal-minimal/cabal-minimal.cabal
Expand Up @@ -12,10 +12,10 @@ copyright: 2022 Kowainik
build-type: Simple
extra-doc-files: README.md
CHANGELOG.md
tested-with: GHC == 9.0.2
tested-with: GHC == 9.6.2

common common-options
build-depends: base ^>= 4.15.1.0
build-depends: base ^>= 4.18.0.0

ghc-options: -Wall
-Wcompat
Expand Down
2 changes: 1 addition & 1 deletion summoner-cli/examples/cabalScript.hs
@@ -1,7 +1,7 @@
#!/usr/bin/env cabal
{- cabal:
build-depends:
, base ^>= 4.15.1.0
, base ^>= 4.18.0.0
-}

main :: IO ()
Expand Down
18 changes: 18 additions & 0 deletions summoner-cli/examples/full-batteries/.github/workflows/ci.yml
Expand Up @@ -25,7 +25,16 @@ jobs:
- "8.8.4"
- "8.10.7"
- "9.0.2"
- "9.2.8"
- "9.4.5"
- "9.6.2"
exclude:
- os: macOS-latest
ghc: 9.4.5
- os: macOS-latest
ghc: 9.2.8
- os: macOS-latest
ghc: 9.0.2
- os: macOS-latest
ghc: 8.10.7
- os: macOS-latest
Expand All @@ -38,6 +47,12 @@ jobs:
ghc: 8.2.2
- os: macOS-latest
ghc: 8.0.2
- os: windows-latest
ghc: 9.4.5
- os: windows-latest
ghc: 9.2.8
- os: windows-latest
ghc: 9.0.2
- os: windows-latest
ghc: 8.10.7
- os: windows-latest
Expand Down Expand Up @@ -106,6 +121,9 @@ jobs:
- "8.8.4"
- "8.10.7"
- "9.0.2"
- "9.2.8"
- "9.4.5"
- "9.6.2"

steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 12 additions & 0 deletions summoner-cli/examples/full-batteries/.travis.yml
Expand Up @@ -20,6 +20,9 @@ jobs:
- ghc: 8.8.4
- ghc: 8.10.7
- ghc: 9.0.2
- ghc: 9.2.8
- ghc: 9.4.5
- ghc: 9.6.2

- ghc: 8.0.2
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.0.2.yaml"
Expand All @@ -40,6 +43,15 @@ jobs:
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.10.7.yaml"

- ghc: 9.0.2
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-9.0.2.yaml"

- ghc: 9.2.8
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-9.2.8.yaml"

- ghc: 9.4.5
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-9.4.5.yaml"

- ghc: 9.6.2
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"

allow_failures:
Expand Down
4 changes: 2 additions & 2 deletions summoner-cli/examples/full-batteries/appveyor.yml
Expand Up @@ -21,12 +21,12 @@ environment:
CABOPTS: --store-dir=C:\\SR

matrix:
- GHCVER: 9.0.2
- GHCVER: 9.6.2

install:
- choco source add -n mistuke -s https://www.myget.org/F/mistuke/api/v2
- choco install -y cabal --version 3.6.2.0
- choco install -y ghc --version 9.0.2
- choco install -y ghc --version 9.6.2
- refreshenv

before_build:
Expand Down
5 changes: 4 additions & 1 deletion summoner-cli/examples/full-batteries/full-batteries.cabal
Expand Up @@ -23,13 +23,16 @@ tested-with: GHC == 8.0.2
GHC == 8.8.4
GHC == 8.10.7
GHC == 9.0.2
GHC == 9.2.8
GHC == 9.4.5
GHC == 9.6.2

source-repository head
type: git
location: https://github.com/kowainik/full-batteries.git

common common-options
build-depends: base >= 4.9.1.0 && < 4.16
build-depends: base >= 4.9.1.0 && < 4.19
, relude

mixins: base hiding (Prelude)
Expand Down
2 changes: 1 addition & 1 deletion summoner-cli/examples/full-batteries/stack-8.10.7.yaml
@@ -1 +1 @@
resolver: lts-18.21
resolver: lts-18.28
1 change: 1 addition & 0 deletions summoner-cli/examples/full-batteries/stack-9.0.2.yaml
@@ -0,0 +1 @@
resolver: lts-19.33
1 change: 1 addition & 0 deletions summoner-cli/examples/full-batteries/stack-9.2.8.yaml
@@ -0,0 +1 @@
resolver: lts-20.26
1 change: 1 addition & 0 deletions summoner-cli/examples/full-batteries/stack-9.4.5.yaml
@@ -0,0 +1 @@
resolver: lts-21.6
2 changes: 1 addition & 1 deletion summoner-cli/examples/full-batteries/stack.yaml
@@ -1 +1 @@
resolver: nightly-2022-01-10
resolver: nightly-2023-08-09
3 changes: 3 additions & 0 deletions summoner-cli/examples/stack-full/.github/workflows/ci.yml
Expand Up @@ -22,6 +22,9 @@ jobs:
- "8.8.4"
- "8.10.7"
- "9.0.2"
- "9.2.8"
- "9.4.5"
- "9.6.2"

steps:
- uses: actions/checkout@v2
Expand Down
9 changes: 9 additions & 0 deletions summoner-cli/examples/stack-full/.travis.yml
Expand Up @@ -26,6 +26,15 @@ jobs:
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-8.10.7.yaml"

- ghc: 9.0.2
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-9.0.2.yaml"

- ghc: 9.2.8
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-9.2.8.yaml"

- ghc: 9.4.5
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack-9.4.5.yaml"

- ghc: 9.6.2
env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"

allow_failures:
Expand Down
2 changes: 1 addition & 1 deletion summoner-cli/examples/stack-full/stack-8.10.7.yaml
@@ -1 +1 @@
resolver: lts-18.21
resolver: lts-18.28
1 change: 1 addition & 0 deletions summoner-cli/examples/stack-full/stack-9.0.2.yaml
@@ -0,0 +1 @@
resolver: lts-19.33
1 change: 1 addition & 0 deletions summoner-cli/examples/stack-full/stack-9.2.8.yaml
@@ -0,0 +1 @@
resolver: lts-20.26
1 change: 1 addition & 0 deletions summoner-cli/examples/stack-full/stack-9.4.5.yaml
@@ -0,0 +1 @@
resolver: lts-21.6
5 changes: 4 additions & 1 deletion summoner-cli/examples/stack-full/stack-full.cabal
Expand Up @@ -21,13 +21,16 @@ tested-with: GHC == 8.4.4
GHC == 8.8.4
GHC == 8.10.7
GHC == 9.0.2
GHC == 9.2.8
GHC == 9.4.5
GHC == 9.6.2

source-repository head
type: git
location: https://github.com/kowainik/stack-full.git

common common-options
build-depends: base >= 4.11.1.0 && < 4.16
build-depends: base >= 4.11.1.0 && < 4.19
, relude

mixins: base hiding (Prelude)
Expand Down
2 changes: 1 addition & 1 deletion summoner-cli/examples/stack-full/stack.yaml
@@ -1 +1 @@
resolver: nightly-2022-01-10
resolver: nightly-2023-08-09
2 changes: 1 addition & 1 deletion summoner-cli/examples/stackScript.hs
@@ -1,6 +1,6 @@
#!/usr/bin/env stack
{- stack
--resolver nightly-2022-01-10
--resolver nightly-2023-08-09
script
--package base
-}
Expand Down
4 changes: 2 additions & 2 deletions summoner-cli/examples/summoner-default.toml
Expand Up @@ -48,9 +48,9 @@ license = "MIT"
# travis = true # Travis CI
# appveyor = true # AppVeyor CI

# List of additional GHC versions to support besides 9.0.2.
# List of additional GHC versions to support besides 9.6.2.
# Run the 'summon show ghc' command to see the list of all supported GHC versions.
# ghcVersions = ["8.8.4", "8.10.7"]
# ghcVersions = ["9.2.8", "9.4.5"]

# List of default-extensions in the .cabal file
# extensions = [ "ConstraintKinds"
Expand Down
7 changes: 5 additions & 2 deletions summoner-cli/test/Test/Show.hs
Expand Up @@ -19,6 +19,9 @@ goldenGhcTable =
, "GHC-8.4.4 base-4.11.1.0 lts-12.26"
, "GHC-8.6.5 base-4.12.0.0 lts-14.27"
, "GHC-8.8.4 base-4.13.0.0 lts-16.31"
, "GHC-8.10.7 base-4.14.3.0 lts-18.21"
, "GHC-9.0.2 base-4.15.1.0 nightly-2022-01-10"
, "GHC-8.10.7 base-4.14.3.0 lts-18.28"
, "GHC-9.0.2 base-4.15.1.0 lts-19.33"
, "GHC-9.2.8 base-4.16.4.0 lts-20.26"
, "GHC-9.4.5 base-4.17.0.0 lts-21.6"
, "GHC-9.6.2 base-4.18.0.0 nightly-2023-08-09"
]

0 comments on commit d50b371

Please sign in to comment.