From 14e1efc84320227c25ac7a0bba03b48021132bdc Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 16 Jul 2021 12:49:46 -1000 Subject: [PATCH] stack: 9.0: rename yaml file, making 9.0 the default --- .github/workflows/linux.yml | 4 ++-- .github/workflows/mac.yml | 6 +++--- .github/workflows/push.yml | 4 ++-- stack9.0.yaml => stack.yaml | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename stack9.0.yaml => stack.yaml (100%) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2e9e6ba8c..8f755068d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -75,9 +75,9 @@ jobs: matrix: plan: - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" } - # - { ghc: "88" , stack: "stack --stack-yaml=stack.yaml" } + # - { ghc: "88" , stack: "stack --stack-yaml=stack8.8.yaml" } # - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" } - # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } + # - { ghc: "90" , stack: "stack --stack-yaml=stack.yaml" } steps: diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index a78c6f3fd..61be89b45 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -45,9 +45,9 @@ jobs: plan: # - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" } # - { ghc: "88" , stack: "stack --stack-yaml=stack8.8.yaml" } - - { ghc: "810" , stack: "stack --stack-yaml=stack.yaml" } - # XXX func tests in bin should be run only with GHC 8.10 for now (see shelltest below) - # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } + - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" } + # XXX func tests in bin should be run only with GHC 8.10 for now (see shelltest below) (?) + # - { ghc: "90" , stack: "stack --stack-yaml=stack.yaml" } steps: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 792ecb31c..c44838a1d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -40,8 +40,8 @@ jobs: plan: # - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" } # - { ghc: "88" , stack: "stack --stack-yaml=stack8.8.yaml" } - - { ghc: "810" , stack: "stack --stack-yaml=stack.yaml" } - # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } + - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" } + # - { ghc: "90" , stack: "stack --stack-yaml=stack.yaml" } steps: diff --git a/stack9.0.yaml b/stack.yaml similarity index 100% rename from stack9.0.yaml rename to stack.yaml