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

Use Base16 hash for script path. (backport #9459) #9483

Merged
merged 1 commit into from
Dec 15, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2023

This is an automatic backport of pull request #9459 done by Mergify.
Cherry-pick of 97f9917 has failed:

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

You are currently cherry-picking commit 97f99171b.
  (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:   cabal-install/cabal-install.cabal
	modified:   cabal-testsuite/src/Test/Cabal/Prelude.hs
	new file:   changelog.d/base16-script-cache

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-install/src/Distribution/Client/HashValue.hs
	both modified:   cabal-install/src/Distribution/Client/ScriptUtils.hs
	both modified:   cabal-testsuite/cabal-testsuite.cabal

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

@mergify mergify bot added the conflicts label Nov 29, 2023
@mergify mergify bot mentioned this pull request Nov 29, 2023
5 tasks
@Kleidukos Kleidukos self-assigned this Nov 29, 2023
@mergify mergify bot added the backport label Nov 29, 2023
@Mikolaj
Copy link
Member

Mikolaj commented Dec 14, 2023

Something is quite borked in these CI failures. Let me try to restart.

@Mikolaj
Copy link
Member

Mikolaj commented Dec 14, 2023

No luck. The error from the boostrap tests is

src/Distribution/Client/HashValue.hs:9:5: error:
    Not in scope: ‘showHashValueBase64’

and the one from Validate tests is hard to fathom, but perhaps it's the same thing?

@jasagredo jasagredo force-pushed the mergify/bp/3.10/pr-9459 branch from 5d7fe7a to 7d3f33e Compare December 14, 2023 21:34
Copy link
Collaborator

@jasagredo jasagredo left a comment

Choose a reason for hiding this comment

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

Rebase conflicts are resolved now

@jasagredo
Copy link
Collaborator

@mergify refresh

Copy link
Contributor Author

mergify bot commented Dec 14, 2023

refresh

✅ Pull request refreshed

@ulysses4ever
Copy link
Collaborator

@mergify rebase

Copy link
Contributor Author

mergify bot commented Dec 14, 2023

rebase

✅ Branch has been successfully rebased

@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.10/pr-9459 branch from 7d3f33e to d84bd02 Compare December 14, 2023 23:39
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.

There is a change in a test that sneaked in here from another PR, but it seems benign. Please feel free to set the merge label.

@jasagredo
Copy link
Collaborator

I'm unsure which change you mean. All I can see in the diff belongs to this change to Base16, also the changes in cabal-testsuite/src/Test/Cabal/Prelude.hs.

@jasagredo jasagredo added the merge me Tell Mergify Bot to merge label Dec 15, 2023
@Mikolaj
Copy link
Member

Mikolaj commented Dec 15, 2023

You are right, I take it back. The addition of default-language: Haskell2010 in the original PR is omitted in the backport because the component in question (test-runtime-deps) is absent on branch 3.10. Anyway, the change is minor, even if it was applicable.

Edit: So, actually, it "sneaked" into the original PR, not into the backport. :)

Issue #9334 shows that `%` characters on Windows result in invalid
paths, also `/` characters on Linux create invalid paths.

This changes from using base64 to using base16 with the same length
we use for unit-ids.

(cherry picked from commit 97f9917)

Co-authored-by: Hécate Moonlight <Kleidukos@users.noreply.github.com>
Co-autohred-by: Javier Sagredo <jasataco@gmail.com>
@Mikolaj Mikolaj force-pushed the mergify/bp/3.10/pr-9459 branch from d84bd02 to 8a35837 Compare December 15, 2023 14:02
@mergify mergify bot merged commit ebf64c5 into 3.10 Dec 15, 2023
40 checks passed
@mergify mergify bot deleted the mergify/bp/3.10/pr-9459 branch December 15, 2023 16:07
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Dec 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 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