From e0af3833b61885b7398b7bcb3c2191b2c7222314 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 19 Dec 2021 19:27:26 +0100 Subject: [PATCH] Use --sourcehut-source only in sourcehut tests --- fixtures/all-versions.bash | 2 +- fixtures/all-versions.github | 4 ++-- fixtures/all-versions.travis | 4 ++-- fixtures/copy-fields-all.bash | 2 +- fixtures/copy-fields-all.github | 4 ++-- fixtures/copy-fields-all.travis | 4 ++-- fixtures/copy-fields-none.bash | 2 +- fixtures/copy-fields-none.github | 4 ++-- fixtures/copy-fields-none.travis | 4 ++-- fixtures/copy-fields-some.bash | 2 +- fixtures/copy-fields-some.github | 4 ++-- fixtures/copy-fields-some.travis | 4 ++-- fixtures/empty-line.bash | 2 +- fixtures/empty-line.github | 4 ++-- fixtures/empty-line.travis | 4 ++-- fixtures/enabled-jobs.bash | 2 +- fixtures/enabled-jobs.github | 4 ++-- fixtures/enabled-jobs.travis | 4 ++-- fixtures/irc-channels.bash | 2 +- fixtures/irc-channels.github | 4 ++-- fixtures/irc-channels.travis | 4 ++-- fixtures/messy.bash | 2 +- fixtures/messy.github | 4 ++-- fixtures/messy.travis | 4 ++-- fixtures/psql.bash | 2 +- fixtures/psql.github | 4 ++-- fixtures/psql.travis | 4 ++-- fixtures/sourcehut-parallel.bash | 2 +- fixtures/sourcehut-parallel.github | 4 ++-- fixtures/sourcehut-parallel.travis | 4 ++-- fixtures/travis-patch.bash | 2 +- fixtures/travis-patch.github | 4 ++-- fixtures/travis-patch.travis | 4 ++-- test/Tests.hs | 4 +++- 34 files changed, 58 insertions(+), 56 deletions(-) diff --git a/fixtures/all-versions.bash b/fixtures/all-versions.bash index d1ad1a13..eb0e74f6 100644 --- a/fixtures/all-versions.bash +++ b/fixtures/all-versions.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: 7.0.1 7.0.2 7.0.3 7.0.4 7.2.1 7.2.2 7.4.1 7.4.2 7.6.1 7.6.2 7.6.3 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.2.1 ghcjs-8.4 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["bash","all-versions.project","--sourcehut-source","https://example.org"] +# REGENDATA ["bash","all-versions.project"] set -o pipefail diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github index 55864cff..635220cc 100644 --- a/fixtures/all-versions.github +++ b/fixtures/all-versions.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: 7.0.1 7.0.2 7.0.3 7.0.4 7.2.1 7.2.2 7.4.1 7.4.2 7.6.1 7.6.2 7.6.3 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.2.1 ghcjs-8.4 # This GitHub workflow config has been generated by a script via # -# haskell-ci 'github' 'all-versions.project' '--sourcehut-source' 'https://example.org' +# haskell-ci 'github' 'all-versions.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["github","all-versions.project","--sourcehut-source","https://example.org"] +# REGENDATA ["github","all-versions.project"] # name: Haskell-CI on: diff --git a/fixtures/all-versions.travis b/fixtures/all-versions.travis index 478ba41f..52571a8b 100644 --- a/fixtures/all-versions.travis +++ b/fixtures/all-versions.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: 7.0.1 7.0.2 7.0.3 7.0.4 7.2.1 7.2.2 7.4.1 7.4.2 7.6.1 7.6.2 7.6.3 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.2.1 ghcjs-8.4 # This Travis job script has been generated by a script via # -# haskell-ci 'travis' 'all-versions.project' '--sourcehut-source' 'https://example.org' +# haskell-ci 'travis' 'all-versions.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -276,5 +276,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["travis","all-versions.project","--sourcehut-source","https://example.org"] +# REGENDATA ["travis","all-versions.project"] # EOF diff --git a/fixtures/copy-fields-all.bash b/fixtures/copy-fields-all.bash index ab0a07cb..4cbf28ed 100644 --- a/fixtures/copy-fields-all.bash +++ b/fixtures/copy-fields-all.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["--copy-fields=all","bash","copy-fields-all.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--copy-fields=all","bash","copy-fields-all.project"] set -o pipefail diff --git a/fixtures/copy-fields-all.github b/fixtures/copy-fields-all.github index c83daf2e..87c6fbbe 100644 --- a/fixtures/copy-fields-all.github +++ b/fixtures/copy-fields-all.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This GitHub workflow config has been generated by a script via # -# haskell-ci '--copy-fields=all' 'github' 'copy-fields-all.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--copy-fields=all' 'github' 'copy-fields-all.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["--copy-fields=all","github","copy-fields-all.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--copy-fields=all","github","copy-fields-all.project"] # name: Haskell-CI on: diff --git a/fixtures/copy-fields-all.travis b/fixtures/copy-fields-all.travis index b41fdc09..f7808a25 100644 --- a/fixtures/copy-fields-all.travis +++ b/fixtures/copy-fields-all.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This Travis job script has been generated by a script via # -# haskell-ci '--copy-fields=all' 'travis' 'copy-fields-all.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--copy-fields=all' 'travis' 'copy-fields-all.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -272,5 +272,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["--copy-fields=all","travis","copy-fields-all.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--copy-fields=all","travis","copy-fields-all.project"] # EOF diff --git a/fixtures/copy-fields-none.bash b/fixtures/copy-fields-none.bash index 447a5f53..0089176e 100644 --- a/fixtures/copy-fields-none.bash +++ b/fixtures/copy-fields-none.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["--copy-fields=none","bash","copy-fields-none.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--copy-fields=none","bash","copy-fields-none.project"] set -o pipefail diff --git a/fixtures/copy-fields-none.github b/fixtures/copy-fields-none.github index d57317f4..829242ca 100644 --- a/fixtures/copy-fields-none.github +++ b/fixtures/copy-fields-none.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This GitHub workflow config has been generated by a script via # -# haskell-ci '--copy-fields=none' 'github' 'copy-fields-none.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--copy-fields=none' 'github' 'copy-fields-none.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["--copy-fields=none","github","copy-fields-none.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--copy-fields=none","github","copy-fields-none.project"] # name: Haskell-CI on: diff --git a/fixtures/copy-fields-none.travis b/fixtures/copy-fields-none.travis index 449f3f4c..21956f55 100644 --- a/fixtures/copy-fields-none.travis +++ b/fixtures/copy-fields-none.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This Travis job script has been generated by a script via # -# haskell-ci '--copy-fields=none' 'travis' 'copy-fields-none.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--copy-fields=none' 'travis' 'copy-fields-none.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -250,5 +250,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["--copy-fields=none","travis","copy-fields-none.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--copy-fields=none","travis","copy-fields-none.project"] # EOF diff --git a/fixtures/copy-fields-some.bash b/fixtures/copy-fields-some.bash index adb6b87a..c2f07c82 100644 --- a/fixtures/copy-fields-some.bash +++ b/fixtures/copy-fields-some.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["--copy-fields=some","bash","copy-fields-some.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--copy-fields=some","bash","copy-fields-some.project"] set -o pipefail diff --git a/fixtures/copy-fields-some.github b/fixtures/copy-fields-some.github index ff8e6762..1d34f62f 100644 --- a/fixtures/copy-fields-some.github +++ b/fixtures/copy-fields-some.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This GitHub workflow config has been generated by a script via # -# haskell-ci '--copy-fields=some' 'github' 'copy-fields-some.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--copy-fields=some' 'github' 'copy-fields-some.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["--copy-fields=some","github","copy-fields-some.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--copy-fields=some","github","copy-fields-some.project"] # name: Haskell-CI on: diff --git a/fixtures/copy-fields-some.travis b/fixtures/copy-fields-some.travis index 76dae605..88beea15 100644 --- a/fixtures/copy-fields-some.travis +++ b/fixtures/copy-fields-some.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This Travis job script has been generated by a script via # -# haskell-ci '--copy-fields=some' 'travis' 'copy-fields-some.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--copy-fields=some' 'travis' 'copy-fields-some.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -256,5 +256,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["--copy-fields=some","travis","copy-fields-some.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--copy-fields=some","travis","copy-fields-some.project"] # EOF diff --git a/fixtures/empty-line.bash b/fixtures/empty-line.bash index bebb3aaa..d20edcbd 100644 --- a/fixtures/empty-line.bash +++ b/fixtures/empty-line.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: ghc-head 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["--ghc-head","bash","empty-line.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--ghc-head","bash","empty-line.project"] set -o pipefail diff --git a/fixtures/empty-line.github b/fixtures/empty-line.github index 6005b296..73dcd5fc 100644 --- a/fixtures/empty-line.github +++ b/fixtures/empty-line.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: ghc-head 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This GitHub workflow config has been generated by a script via # -# haskell-ci '--ghc-head' 'github' 'empty-line.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--ghc-head' 'github' 'empty-line.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["--ghc-head","github","empty-line.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--ghc-head","github","empty-line.project"] # name: Haskell-CI on: diff --git a/fixtures/empty-line.travis b/fixtures/empty-line.travis index 2be19f92..c698b9dd 100644 --- a/fixtures/empty-line.travis +++ b/fixtures/empty-line.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: ghc-head 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This Travis job script has been generated by a script via # -# haskell-ci '--ghc-head' 'travis' 'empty-line.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--ghc-head' 'travis' 'empty-line.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -280,5 +280,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["--ghc-head","travis","empty-line.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--ghc-head","travis","empty-line.project"] # EOF diff --git a/fixtures/enabled-jobs.bash b/fixtures/enabled-jobs.bash index e3e11d00..6c5a5d8d 100644 --- a/fixtures/enabled-jobs.bash +++ b/fixtures/enabled-jobs.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.2.1 ghcjs-8.4 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["--enabled-jobs=>=8","bash","enabled-jobs.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--enabled-jobs=>=8","bash","enabled-jobs.project"] set -o pipefail diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github index 99ca8f43..632df864 100644 --- a/fixtures/enabled-jobs.github +++ b/fixtures/enabled-jobs.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.2.1 ghcjs-8.4 # This GitHub workflow config has been generated by a script via # -# haskell-ci '--enabled-jobs=>=8' 'github' 'enabled-jobs.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--enabled-jobs=>=8' 'github' 'enabled-jobs.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["--enabled-jobs=>=8","github","enabled-jobs.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--enabled-jobs=>=8","github","enabled-jobs.project"] # name: Haskell-CI on: diff --git a/fixtures/enabled-jobs.travis b/fixtures/enabled-jobs.travis index adab56a4..80fd0371 100644 --- a/fixtures/enabled-jobs.travis +++ b/fixtures/enabled-jobs.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.2.1 ghcjs-8.4 # This Travis job script has been generated by a script via # -# haskell-ci '--enabled-jobs=>=8' 'travis' 'enabled-jobs.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--enabled-jobs=>=8' 'travis' 'enabled-jobs.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -222,5 +222,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["--enabled-jobs=>=8","travis","enabled-jobs.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--enabled-jobs=>=8","travis","enabled-jobs.project"] # EOF diff --git a/fixtures/irc-channels.bash b/fixtures/irc-channels.bash index d7062cf5..dddbb345 100644 --- a/fixtures/irc-channels.bash +++ b/fixtures/irc-channels.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["--irc-channels=irc.libera.chat#mychannel","bash","irc-channels.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--irc-channels=irc.libera.chat#mychannel","bash","irc-channels.project"] set -o pipefail diff --git a/fixtures/irc-channels.github b/fixtures/irc-channels.github index 2fd44aee..29695221 100644 --- a/fixtures/irc-channels.github +++ b/fixtures/irc-channels.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This GitHub workflow config has been generated by a script via # -# haskell-ci '--irc-channels=irc.libera.chat#mychannel' 'github' 'irc-channels.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--irc-channels=irc.libera.chat#mychannel' 'github' 'irc-channels.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["--irc-channels=irc.libera.chat#mychannel","github","irc-channels.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--irc-channels=irc.libera.chat#mychannel","github","irc-channels.project"] # name: Haskell-CI on: diff --git a/fixtures/irc-channels.travis b/fixtures/irc-channels.travis index 45b0fb98..7465b874 100644 --- a/fixtures/irc-channels.travis +++ b/fixtures/irc-channels.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This Travis job script has been generated by a script via # -# haskell-ci '--irc-channels=irc.libera.chat#mychannel' 'travis' 'irc-channels.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--irc-channels=irc.libera.chat#mychannel' 'travis' 'irc-channels.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -230,5 +230,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["--irc-channels=irc.libera.chat#mychannel","travis","irc-channels.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--irc-channels=irc.libera.chat#mychannel","travis","irc-channels.project"] # EOF diff --git a/fixtures/messy.bash b/fixtures/messy.bash index 04acaabb..ca8ad63f 100644 --- a/fixtures/messy.bash +++ b/fixtures/messy.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: ghc-head 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["--ghc-head","--apt=fftw3-dev","--installed=-all +deepseq","bash","messy.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--ghc-head","--apt=fftw3-dev","--installed=-all +deepseq","bash","messy.project"] set -o pipefail diff --git a/fixtures/messy.github b/fixtures/messy.github index 39b6bf32..251add35 100644 --- a/fixtures/messy.github +++ b/fixtures/messy.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: ghc-head 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This GitHub workflow config has been generated by a script via # -# haskell-ci '--ghc-head' '--apt=fftw3-dev' '--installed=-all +deepseq' 'github' 'messy.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--ghc-head' '--apt=fftw3-dev' '--installed=-all +deepseq' 'github' 'messy.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["--ghc-head","--apt=fftw3-dev","--installed=-all +deepseq","github","messy.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--ghc-head","--apt=fftw3-dev","--installed=-all +deepseq","github","messy.project"] # name: Haskell-CI on: diff --git a/fixtures/messy.travis b/fixtures/messy.travis index ce5da81a..24c23fcf 100644 --- a/fixtures/messy.travis +++ b/fixtures/messy.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: ghc-head 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This Travis job script has been generated by a script via # -# haskell-ci '--ghc-head' '--apt=fftw3-dev' '--installed=-all +deepseq' 'travis' 'messy.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--ghc-head' '--apt=fftw3-dev' '--installed=-all +deepseq' 'travis' 'messy.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -274,5 +274,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["--ghc-head","--apt=fftw3-dev","--installed=-all +deepseq","travis","messy.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--ghc-head","--apt=fftw3-dev","--installed=-all +deepseq","travis","messy.project"] # EOF diff --git a/fixtures/psql.bash b/fixtures/psql.bash index d66d0381..ac5350da 100644 --- a/fixtures/psql.bash +++ b/fixtures/psql.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["--postgresql","bash","psql.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--postgresql","bash","psql.project"] set -o pipefail diff --git a/fixtures/psql.github b/fixtures/psql.github index 1f2136fe..eb25dd01 100644 --- a/fixtures/psql.github +++ b/fixtures/psql.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This GitHub workflow config has been generated by a script via # -# haskell-ci '--postgresql' 'github' 'psql.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--postgresql' 'github' 'psql.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["--postgresql","github","psql.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--postgresql","github","psql.project"] # name: Haskell-CI on: diff --git a/fixtures/psql.travis b/fixtures/psql.travis index 48df3f37..1b3a6544 100644 --- a/fixtures/psql.travis +++ b/fixtures/psql.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This Travis job script has been generated by a script via # -# haskell-ci '--postgresql' 'travis' 'psql.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--postgresql' 'travis' 'psql.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -227,5 +227,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["--postgresql","travis","psql.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--postgresql","travis","psql.project"] # EOF diff --git a/fixtures/sourcehut-parallel.bash b/fixtures/sourcehut-parallel.bash index b367120a..69dd2134 100644 --- a/fixtures/sourcehut-parallel.bash +++ b/fixtures/sourcehut-parallel.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["--sourcehut-parallel","bash","sourcehut-parallel.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--sourcehut-parallel","bash","sourcehut-parallel.project"] set -o pipefail diff --git a/fixtures/sourcehut-parallel.github b/fixtures/sourcehut-parallel.github index eba63cae..57ef2ad9 100644 --- a/fixtures/sourcehut-parallel.github +++ b/fixtures/sourcehut-parallel.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This GitHub workflow config has been generated by a script via # -# haskell-ci '--sourcehut-parallel' 'github' 'sourcehut-parallel.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--sourcehut-parallel' 'github' 'sourcehut-parallel.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["--sourcehut-parallel","github","sourcehut-parallel.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--sourcehut-parallel","github","sourcehut-parallel.project"] # name: Haskell-CI on: diff --git a/fixtures/sourcehut-parallel.travis b/fixtures/sourcehut-parallel.travis index 1e4f25e6..4f6421a8 100644 --- a/fixtures/sourcehut-parallel.travis +++ b/fixtures/sourcehut-parallel.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This Travis job script has been generated by a script via # -# haskell-ci '--sourcehut-parallel' 'travis' 'sourcehut-parallel.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--sourcehut-parallel' 'travis' 'sourcehut-parallel.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -223,5 +223,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["--sourcehut-parallel","travis","sourcehut-parallel.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--sourcehut-parallel","travis","sourcehut-parallel.project"] # EOF diff --git a/fixtures/travis-patch.bash b/fixtures/travis-patch.bash index 62057c82..86f202f1 100644 --- a/fixtures/travis-patch.bash +++ b/fixtures/travis-patch.bash @@ -2,7 +2,7 @@ # *INFO* Generating Bash script for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 #!/bin/bash # shellcheck disable=SC2086,SC2016,SC2046 -# REGENDATA ["--travis-patches=travis-patch.patch","bash","travis-patch.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--travis-patches=travis-patch.patch","bash","travis-patch.project"] set -o pipefail diff --git a/fixtures/travis-patch.github b/fixtures/travis-patch.github index 5c49cce8..28aad682 100644 --- a/fixtures/travis-patch.github +++ b/fixtures/travis-patch.github @@ -2,7 +2,7 @@ # *INFO* Generating GitHub config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This GitHub workflow config has been generated by a script via # -# haskell-ci '--travis-patches=travis-patch.patch' 'github' 'travis-patch.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--travis-patches=travis-patch.patch' 'github' 'travis-patch.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# REGENDATA ["--travis-patches=travis-patch.patch","github","travis-patch.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--travis-patches=travis-patch.patch","github","travis-patch.project"] # name: Haskell-CI on: diff --git a/fixtures/travis-patch.travis b/fixtures/travis-patch.travis index 5aff1bc3..57680715 100644 --- a/fixtures/travis-patch.travis +++ b/fixtures/travis-patch.travis @@ -2,7 +2,7 @@ # *INFO* Generating Travis-CI config for testing for GHC versions: 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 # This Travis job script has been generated by a script via # -# haskell-ci '--travis-patches=travis-patch.patch' 'travis' 'travis-patch.project' '--sourcehut-source' 'https://example.org' +# haskell-ci '--travis-patches=travis-patch.patch' 'travis' 'travis-patch.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -223,5 +223,5 @@ script: - rm -f cabal.project.local - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all -# REGENDATA ["--travis-patches=travis-patch.patch","travis","travis-patch.project","--sourcehut-source","https://example.org"] +# REGENDATA ["--travis-patches=travis-patch.patch","travis","travis-patch.project"] # EOF diff --git a/test/Tests.hs b/test/Tests.hs index d3055df5..3ce5cf4b 100644 --- a/test/Tests.hs +++ b/test/Tests.hs @@ -81,7 +81,9 @@ fixtureGoldenTest fp = testGroup fp makeFlags :: IO ([String], Options) makeFlags = do argv <- readArgv - let argv' = argv ++ [name, projectfp] ++ ["--sourcehut-source", "https://example.org"] + let argv' = argv ++ [name, projectfp] ++ + [ arg | arg <- ["--sourcehut-source", "https://example.org"] + , name == "sourcehut" ] (_fp, opts) <- parseOptions argv' return (argv', opts)