Merge pull request #694 from haskell-CI/shellcheck-update

Drop SHellCheck allow-newer's
haskell-CI · Dec 14, 2023 · babb495 · babb495
2 parents ab13050 + 9f9ead0
commit babb495
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 30 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -226,22 +226,13 @@ jobs:
             ghc-options: -Werror=missing-methods -Werror=missing-fields
           EOF
           cat >> cabal.project <<EOF
-          allow-newer: ShellCheck-0.9.0:aeson
-          allow-newer: ShellCheck-0.9.0:bytestring
-          allow-newer: ShellCheck-0.9.0:deepseq
-          allow-newer: ShellCheck-0.9.0:Diff
-          allow-newer: ShellCheck-0.9.0:fgl
-          allow-newer: ShellCheck-0.9.0:mtl
-          allow-newer: ShellCheck-0.9.0:text
-          allow-newer: ShellCheck-0.9.0:transformers
-
           package haskell-ci
             ghc-options: -Werror
 
           package cabal-install-parsers
             ghc-options: -Werror
 
-          keep-going:  False
+          keep-going: False
 
           package bytestring
             tests: False

diff --git a/cabal.project b/cabal.project
@@ -6,13 +6,3 @@ tests: True
 package haskell-ci
   ghc-options: -Wall
   ghc-options: -Werror
-
--- ShellCheck doesn't allow newer versions of dependencies
-allow-newer: ShellCheck-0.9.0:aeson
-allow-newer: ShellCheck-0.9.0:bytestring
-allow-newer: ShellCheck-0.9.0:deepseq
-allow-newer: ShellCheck-0.9.0:Diff
-allow-newer: ShellCheck-0.9.0:fgl
-allow-newer: ShellCheck-0.9.0:mtl
-allow-newer: ShellCheck-0.9.0:text
-allow-newer: ShellCheck-0.9.0:transformers
diff --git a/haskell-ci.sh b/haskell-ci.sh
@@ -482,22 +482,13 @@ package *
   ghc-options: -Werror=missing-methods
 EOF
 cat >> cabal.project <<EOF
-allow-newer: ShellCheck-0.9.0:aeson
-allow-newer: ShellCheck-0.9.0:bytestring
-allow-newer: ShellCheck-0.9.0:deepseq
-allow-newer: ShellCheck-0.9.0:Diff
-allow-newer: ShellCheck-0.9.0:fgl
-allow-newer: ShellCheck-0.9.0:mtl
-allow-newer: ShellCheck-0.9.0:text
-allow-newer: ShellCheck-0.9.0:transformers
-
 package haskell-ci
   ghc-options: -Werror
 
 package cabal-install-parsers
   ghc-options: -Werror
 
-keep-going:  False
+keep-going: False
 
 package bytestring
   tests: False