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

Include extra-lib-dirs-static into PackageHash #7794

Merged
merged 2 commits into from
Dec 17, 2022

Conversation

alexbiehl
Copy link
Member

@alexbiehl alexbiehl commented Nov 3, 2021

Continuing working on the matter and found we were missing the extra-libs-static in PackageHash.


Please include the following checklist in your PR:

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

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.

Given that there's no test and, I assume, the main PR will be tested, could you add a changelog and mention there the main PR and/or main issue?

@jneira
Copy link
Member

jneira commented Nov 3, 2021

We could add a test similar to the used one for check the fix for duplicate entries in package hash inputs: https://github.com/haskell/cabal/tree/master/cabal-testsuite/PackageTests/Regression/T6906

@Mikolaj
Copy link
Member

Mikolaj commented Nov 8, 2021

@alexbiehl: CI should run fine once you rebase --- I fixed the failure.

@Mikolaj
Copy link
Member

Mikolaj commented Nov 15, 2021

CI is green, we just need a minimal changelog file and test.

@Mikolaj
Copy link
Member

Mikolaj commented Nov 29, 2021

@alexbiehl: may I help you in getting this PR to the finish line? :)

@alexbiehl
Copy link
Member Author

@alexbiehl: may I help you in getting this PR to the finish line? :)

I am sorry I didn't get to this. Help would be very much appreciated.

@alexbiehl
Copy link
Member Author

I also opened https://gitlab.haskell.org/ghc/ghc/-/issues/20759 upstream to track the GHC side of things.

@Mikolaj
Copy link
Member

Mikolaj commented Nov 29, 2021

Given that this is a part of #6935, the changelog.d/pr-7794 could be

synopsis: Include extra-lib-dirs-static into PackageHash
packages: cabal-install
prs: #7794
issues: #6935

@Mikolaj
Copy link
Member

Mikolaj commented Nov 29, 2021

We could add a test similar to the used one for check the fix for duplicate entries in package hash inputs: https://github.com/haskell/cabal/tree/master/cabal-testsuite/PackageTests/Regression/T6906

@alexbiehl: I think a copy-paste of this test would be an acceptably cheap way of testing this functionality. What do you think? Would you add that?

@Mikolaj
Copy link
Member

Mikolaj commented Jan 29, 2022

@alexbiehl: ping?

@jneira
Copy link
Member

jneira commented Mar 14, 2022

Given that this is a part of #6935, the changelog.d/pr-7794 could be

synopsis: Include extra-lib-dirs-static into PackageHash
packages: cabal-install
prs: #7794
issues: #6935

hmm #6935 is a pr, not an issue, and afaics #6935 does not have a clear linked issue, so maybe we should remove issues: #6935 from the changelog?

@jneira
Copy link
Member

jneira commented Mar 18, 2022

@Mergifyio rebase master

@mergify
Copy link
Contributor

mergify bot commented Mar 18, 2022

rebase master

✅ Branch has been successfully rebased

Copy link
Member

@jneira jneira left a comment

Choose a reason for hiding this comment

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

the pr looks good but needs a changelog entry and a test, thanks

@emilypi
Copy link
Member

emilypi commented Apr 21, 2022

Changelog entry + tests should be added - approved otherwise

@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
@Mikolaj
Copy link
Member

Mikolaj commented Oct 19, 2022

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Oct 19, 2022

rebase

✅ Branch has been successfully rebased

@Mikolaj
Copy link
Member

Mikolaj commented Oct 20, 2022

@alexbiehl: the PR is still good, CI passes! May we assist you in shipping it? Alternatively, would you like to post it for adoption?

@Mikolaj
Copy link
Member

Mikolaj commented Nov 11, 2022

@alexbiehl: respectful ping?

@alexbiehl
Copy link
Member Author

alexbiehl commented Nov 18, 2022

Hi! I am not sure how to test this TBH. Also this is a bug fix for something that is purely internal rn so I am not sure it needs an entry in the changelog.

@Mikolaj
Copy link
Member

Mikolaj commented Dec 15, 2022

@alexbiehl: I hope we can meet in the middle. :D

We require changelogs for anything that differs from last published version, regardless of how internal the things are (so only a fix of a bug introduced in devel version would not require a changelog, if it refrained from modifying any extra things). However, if the test is hard to do and the change is internal, I think we can risk it (more than usual) without a dedicated test.

BTW, if you could also smuggle into the PR the changelog fixup @jneira mentions in #7794 (comment), that would be super-awesome.

@alexbiehl
Copy link
Member Author

@Mikolaj I did add the changelog entry as suggested by @jneira

Copy link

@jneira-stratio jneira-stratio left a comment

Choose a reason for hiding this comment

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

a test would be great, bur as you consider, thanks!

@Mikolaj
Copy link
Member

Mikolaj commented Dec 16, 2022

@alexbiehl: feel free to add the trigger label: merge_me or merge_me+squash.

@alexbiehl alexbiehl merged commit f530878 into haskell:master Dec 17, 2022
@alexbiehl alexbiehl deleted the alex/static-pkg-hash branch December 17, 2022 11:31
@Mikolaj
Copy link
Member

Mikolaj commented Dec 17, 2022

@alexbiehl: thank you once again. BTW. we now merge via the mergify labels: https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#github-pull-request-conventions, which prevents complicated merge histories such us the one you just created and give interested people 2 more days to look at the final code before it's (rebased and) merged.

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

Successfully merging this pull request may close these issues.

7 participants