Skip to content
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

Bump Cabal version to 3.7 for development #7571

Merged
merged 2 commits into from
Aug 25, 2021

Conversation

fendor
Copy link
Collaborator

@fendor fendor commented Aug 23, 2021

closes #7569

Please also shortly describe how you tested your change. Bonus points for added tests!

The changes have been created by manually looking for version:(\s*)3.6.0.0, replacing them with version:$13.7.0.0, then grepping every occurrence of 3.6.0.0 in cabal files with 3.7.0.0. Then make bootstrap-plans-linux bootstrap-jsons-linux, followed by updating the zinza template and then make github-actions.

@fendor fendor requested review from Mikolaj, emilypi and fgaz August 23, 2021 10:32
@@ -111,4 +111,4 @@ jobs:
cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
- name: cabal-tests
# Using only one job, -j1, to fail less.
run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.10.4\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=$(cabal list-bin exe:cabal)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The windows executor is powershell, so bourne shell stuff doesn't work.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, just noticed. Tried something for powershell, if that still doesn't work I'll just resort to not improving this.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make improvements in separate commits. It would be great to have "this is how you bump version" commits, which don't do anything else.

@fendor fendor force-pushed the bump-cabal-version-3.7 branch 3 times, most recently from 57085bb to a47d2b4 Compare August 23, 2021 16:11
@Mikolaj
Copy link
Member

Mikolaj commented Aug 25, 2021

The last remaining CI error seems to stem from some hardwired paths.

@fendor fendor force-pushed the bump-cabal-version-3.7 branch from a47d2b4 to 27a7228 Compare August 25, 2021 10:25
@fendor
Copy link
Collaborator Author

fendor commented Aug 25, 2021

Ping, I would appreciate the merge :)

@emilypi
Copy link
Member

emilypi commented Aug 25, 2021

@Mergifyio update

@emilypi emilypi added the merge me Tell Mergify Bot to merge label Aug 25, 2021
@mergify
Copy link
Contributor

mergify bot commented Aug 25, 2021

Command update: success

Branch has been successfully updated

@emilypi emilypi merged commit 6f932b7 into haskell:master Aug 25, 2021
@andreasabel andreasabel added the re: version About the version of the Cabal library and cabal-install label Sep 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge me Tell Mergify Bot to merge re: version About the version of the Cabal library and cabal-install
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bump Cabal library and cabal-install version to 3.7
6 participants