Skip to content

Fix #8316: run fix-whitespace --check as CI workflow (backport #8320) #8518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 7, 2022

This is an automatic backport of pull request #8320 done by Mergify.
Cherry-pick of b1f59dd has failed:

On branch mergify/bp/3.8/pr-8320
Your branch is up to date with 'origin/3.8'.

You are currently cherry-picking commit b1f59dde5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .gitlab/ci.sh
	modified:   Cabal-syntax/src/Distribution/Backpack.hs
	modified:   Cabal-syntax/src/Distribution/Fields/Pretty.hs
	modified:   Cabal-syntax/src/Distribution/SPDX/LicenseExceptionId.hs
	modified:   Cabal-syntax/src/Distribution/SPDX/LicenseId.hs
	modified:   Cabal-syntax/src/Distribution/Types/CondTree.hs
	modified:   Cabal-syntax/src/Distribution/Types/ExeDependency.hs
	modified:   Cabal-syntax/src/Distribution/Types/LibraryName.hs
	modified:   Cabal-syntax/src/Distribution/Types/Mixin.hs
	modified:   Cabal-syntax/src/Distribution/Types/PkgconfigVersion.hs
	modified:   Cabal-syntax/src/Distribution/Utils/Generic.hs
	modified:   Cabal-tests/tests/ParserTests/errors/leading-comma-2c.cabal
	modified:   Cabal-tests/tests/ParserTests/regressions/cc-options-with-optimization.cabal
	modified:   Cabal-tests/tests/ParserTests/regressions/cxx-options-with-optimization.cabal
	modified:   Cabal-tests/tests/ParserTests/regressions/hasktorch.cabal
	modified:   Cabal-tests/tests/ParserTests/regressions/issue-7776-a.cabal
	modified:   Cabal-tests/tests/UnitTests/Distribution/Simple/Command.hs
	modified:   Cabal-tests/tests/cbits/rpmvercmp.c
	modified:   Cabal-tests/tests/hackage/check.sh
	modified:   Cabal-tests/tests/hackage/download.sh
	modified:   Cabal-tests/tests/misc/ghc-supported-languages.hs
	modified:   Cabal/src/Distribution/ReadE.hs
	modified:   Cabal/src/Distribution/Simple/Program/ResponseFile.hs
	modified:   bootstrap/README.md
	modified:   bootstrap/src/Main.hs
	modified:   buildinfo-reference-generator/template.zinza
	modified:   cabal-dev-scripts/src/GenCabalInstallCabal.hs
	modified:   cabal-dev-scripts/src/GenUtils.hs
	modified:   cabal-install/src/Distribution/Client/BuildReports/Anonymous.hs
	modified:   cabal-install/src/Distribution/Client/CmdBench.hs
	modified:   cabal-install/src/Distribution/Client/CmdInstall/ClientInstallFlags.hs
	modified:   cabal-install/src/Distribution/Client/Init/Format.hs
	modified:   cabal-install/src/Distribution/Client/Init/NonInteractive/Command.hs
	modified:   cabal-install/src/Distribution/Client/Init/NonInteractive/Heuristics.hs
	modified:   cabal-install/src/Distribution/Client/Sandbox/PackageEnvironment.hs
	modified:   cabal-install/src/Distribution/Client/Types/ConfiguredPackage.hs
	modified:   cabal-install/src/Distribution/Client/Version.hs
	modified:   cabal-install/src/Distribution/Deprecated/ViewAsFieldDescr.hs
	modified:   cabal-install/tests/IntegrationTests2/build/ignore-project/a.cabal
	modified:   cabal-install/tests/IntegrationTests2/targets/simple/p.cabal
	modified:   cabal-install/tests/IntegrationTests2/targets/variety/p.cabal
	modified:   cabal-install/tests/UnitTests/Distribution/Client/Configure.hs
	modified:   cabal-install/tests/UnitTests/Distribution/Client/Get.hs
	modified:   cabal-install/tests/UnitTests/Distribution/Client/IndexUtils.hs
	modified:   cabal-install/tests/UnitTests/Distribution/Client/Init/FileCreators.hs
	modified:   cabal-install/tests/UnitTests/Distribution/Client/Init/Golden.hs
	modified:   cabal-install/tests/UnitTests/Distribution/Client/Init/Interactive.hs
	modified:   cabal-install/tests/UnitTests/Distribution/Client/Init/NonInteractive.hs
	modified:   cabal-install/tests/UnitTests/Distribution/Client/InstallPlan.hs
	modified:   cabal-install/tests/fixtures/configure/cabal.project.local
	modified:   cabal-testsuite/PackageTests/CCompilerOverride/custom-cc.bat
	modified:   cabal-testsuite/PackageTests/Check/InvalidGlob/pkg.cabal
	modified:   cabal-testsuite/PackageTests/Check/MissingGlobDirectory/pkg.cabal
	modified:   cabal-testsuite/PackageTests/Check/SynopsisLength/cabal.test.hs
	modified:   cabal-testsuite/PackageTests/Check/SynopsisLength/pkg.cabal
	modified:   cabal-testsuite/PackageTests/CmmSources/cmmexperiment.cabal
	modified:   cabal-testsuite/PackageTests/CmmSourcesDyn/cmmexperiment.cabal
	modified:   cabal-testsuite/PackageTests/CustomPreProcess/internal-preprocessor-test.cabal
	modified:   cabal-testsuite/PackageTests/HaddockNewline/HaddockNewline.cabal
	modified:   cabal-testsuite/PackageTests/Init/app/Main.hs
	modified:   cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/foo/foo.cabal
	modified:   cabal-testsuite/PackageTests/NewBuild/T3460/T3460.cabal
	modified:   cabal-testsuite/PackageTests/NewBuild/T3460/sub-package-A/sub-package-A.cabal
	modified:   cabal-testsuite/PackageTests/NewBuild/T3460/sub-package-B/sub-package-B.cabal
	modified:   cabal-testsuite/PackageTests/Regression/T5213/cabal.test.hs
	modified:   cabal-testsuite/PackageTests/Regression/T5213ExeCoverage/cabal.test.hs
	modified:   cabal-testsuite/PackageTests/Regression/T5309/T5309.cabal
	modified:   cabal-testsuite/PackageTests/Regression/T5309/lib/Bio/Character/Exportable/Class.hs
	modified:   cabal-testsuite/PackageTests/Regression/T5782Diamond/issue5782/Main.hs
	modified:   cabal-testsuite/PackageTests/ShowBuildInfo/Custom/custom.test.hs
	modified:   cabal-testsuite/PackageTests/TestCodeGenerator/test-code-gen/LICENSE
	modified:   cabal-testsuite/PackageTests/TestCodeGenerator/test-code-gen/app/Main.hs
	modified:   cabal-testsuite/PackageTests/postCheckoutCommand/cabal.test.hs
	modified:   doc/README.md
	modified:   generics-sop-lens.hs
	modified:   license-list-data/exceptions-3.0.json
	modified:   license-list-data/exceptions-3.10.json
	modified:   license-list-data/exceptions-3.16.json
	modified:   license-list-data/exceptions-3.2.json
	modified:   license-list-data/exceptions-3.6.json
	modified:   license-list-data/exceptions-3.9.json
	modified:   license-list-data/licenses-3.0.json
	modified:   license-list-data/licenses-3.10.json
	modified:   license-list-data/licenses-3.16.json
	modified:   license-list-data/licenses-3.2.json
	modified:   license-list-data/licenses-3.6.json
	modified:   license-list-data/licenses-3.9.json
	modified:   release-notes/Cabal-3.4.0.0.md
	modified:   release-notes/Cabal-3.8.1.0.md
	modified:   release-notes/cabal-install-3.4.0.0.md
	modified:   solver-benchmarks/HackageBenchmark.hs
	modified:   templates/SPDX.LicenseExceptionId.template.hs
	modified:   templates/SPDX.LicenseId.template.hs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cabal/src/Distribution/Simple/Haddock.hs
	deleted by us:   cabal-install/src/Distribution/Client/CmdHaddockProject.hs
	both modified:   doc/cabal-project.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit b1f59dd)

# Conflicts:
#	Cabal/src/Distribution/Simple/Haddock.hs
#	cabal-install/src/Distribution/Client/CmdHaddockProject.hs
#	doc/cabal-project.rst
@ulysses4ever
Copy link
Collaborator

Conflicts... that's too bad.

@ulysses4ever
Copy link
Collaborator

That's too combersome. The easier path is to not to include whitespace job in the backports. See #8514.

@mergify mergify bot deleted the mergify/bp/3.8/pr-8320 branch October 7, 2022 13:21
@Mikolaj
Copy link
Member

Mikolaj commented Oct 24, 2022

Makes sense. Currently Whitespace CI job is not mandatory for 3.* branches. Let's stick to it until the next release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants