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

*.project.* files use program-options to specify -fno-ignore-asserts #8350

Merged
merged 1 commit into from
Oct 19, 2022

Conversation

ulysses4ever
Copy link
Collaborator

@ulysses4ever ulysses4ever commented Aug 9, 2022

Simplifies *.project.* files a bit. It wasn't feasible before #7973, as program-options were applied to dependencies as well, which is undesirable.

This is undoing 0c99981, which was a stop-gap against #3911. #7973 should cover #3911 these days.

TODO:


Please include the following checklist in your PR:

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

@ulysses4ever ulysses4ever marked this pull request as draft August 10, 2022 00:23
@ulysses4ever
Copy link
Collaborator Author

Hmm... it seems like the global program-options still hurt build time? CI was cancelled for reasons I don't understand, but the build time seems to be higher than on other jobs...

@ulysses4ever ulysses4ever force-pushed the global-no-ignore-asserts branch 3 times, most recently from de8077a to af676c1 Compare August 10, 2022 02:16
@Mikolaj
Copy link
Member

Mikolaj commented Aug 10, 2022

Oh dear, this time CI failed on Linux, in a similar way.

@Mikolaj
Copy link
Member

Mikolaj commented Aug 10, 2022

FYI: CI is borked right now (#8356), so the error probably has nothing to do with this PR.

@Mikolaj
Copy link
Member

Mikolaj commented Aug 11, 2022

Let me rebase to see if the recent CI workaround unblocks merging.

@Mikolaj
Copy link
Member

Mikolaj commented Aug 11, 2022

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Aug 11, 2022

rebase

✅ Branch has been successfully rebased

@ulysses4ever ulysses4ever force-pushed the global-no-ignore-asserts branch from af676c1 to e443774 Compare August 11, 2022 17:56
@Mikolaj
Copy link
Member

Mikolaj commented Aug 12, 2022

It fails differently now...

@ulysses4ever
Copy link
Collaborator Author

Right... My main concern right now is not failures but the gigantic running time of the succeeding jobs. This wasn't supposed to happen with #7973. Unless I'm missing something (like GHA caching).

@jneira
Copy link
Member

jneira commented Aug 13, 2022

I think the cause is ci is still using cabal 3.6.2.0, which does not include the change

@ulysses4ever
Copy link
Collaborator Author

Ooh, that makes sense, thank you! So this will have to sit until we decide to migrate CI to 3.8...

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Sep 1, 2022
@ulysses4ever ulysses4ever removed the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Sep 3, 2022
@ulysses4ever
Copy link
Collaborator Author

ulysses4ever commented Oct 1, 2022

CI is at 3.8 now (afair), do maybe it's the prime time?..

@ulysses4ever
Copy link
Collaborator Author

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Oct 1, 2022

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
error: could not apply e44377417... *.project.* files use program-options to specify -fno-ignore-asserts
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply e44377417... *.project.* files use program-options to specify -fno-ignore-asserts
Auto-merging cabal.project
CONFLICT (content): Merge conflict in cabal.project

err-code: 63F1C

@ulysses4ever ulysses4ever force-pushed the global-no-ignore-asserts branch from e443774 to 02669e0 Compare October 2, 2022 01:09
@ulysses4ever ulysses4ever marked this pull request as ready for review October 2, 2022 13:52
@ulysses4ever
Copy link
Collaborator Author

All right, CI time is normal now (~22 mins per validate job), which means that program-options are applied only to local packages as expected. Ready for review!

Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

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

Thanks a lot!

@Mikolaj
Copy link
Member

Mikolaj commented Oct 17, 2022

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Oct 17, 2022

rebase

✅ Branch has been successfully rebased

@andreabedini andreabedini force-pushed the global-no-ignore-asserts branch from 02669e0 to 045f742 Compare October 17, 2022 14:02
@Mikolaj
Copy link
Member

Mikolaj commented Oct 17, 2022

Ci looks like it may succeed, so let me take the liberty of setting the merge_me label.

@Mikolaj Mikolaj added the merge me Tell Mergify Bot to merge label Oct 17, 2022
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Oct 19, 2022
Simplifies *.project.* files a bit. It wasn't feasible before #7973,
as program-options were applied to dependencies as well, which is undesirable.
@ulysses4ever ulysses4ever force-pushed the global-no-ignore-asserts branch from 045f742 to 93b2f0d Compare October 19, 2022 15:35
@mergify mergify bot merged commit 29103f9 into master Oct 19, 2022
@andreabedini andreabedini deleted the global-no-ignore-asserts branch December 14, 2023 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
attention: needs-review merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants