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.

Sign up for GitHub

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

Jump to bottom

Fix OPAMFETCH/OPAMCURL handling #5607

Merged
merged 4 commits into from
Sep 12, 2023
Merged

Fix OPAMFETCH/OPAMCURL handling #5607

merged 4 commits into from
Sep 12, 2023

Conversation

rjbou
Copy link
Collaborator

@rjbou rjbou commented Jul 19, 2023 •
edited by kit-ty-kate
Loading

OPAMCURL is ignored if OPAMFETCH is set. This is changed to handle OPAMCURL specification when OPAMFETCH is set to curl (simple command, or new arguments). If OPAMFETCH is set to another tool, OPAMCURL is ignored.

Todo:

@rjbou rjbou linked an issue Jul 19, 2023 that may be closed by this pull request
opam init using the wrong wget #5597
Closed
@rjbou rjbou mentioned this pull request Jul 19, 2023
Closed
@rjbou rjbou added this to the 2.2.0~alpha2 milestone Jul 19, 2023
@rjbou rjbou force-pushed the opamcurl branch 2 times, most recently from eb1bf69 to b94bb8f Compare July 20, 2023 08:15
@rjbou rjbou removed this from the 2.2.0~alpha2 milestone Jul 21, 2023
@rjbou rjbou added the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Sep 5, 2023
AltGr
AltGr approved these changes Sep 7, 2023
View reviewed changes
Copy link
Member

@AltGr AltGr left a comment

Choose a reason for hiding this comment

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

Seems reasonable to me!

@kit-ty-kate kit-ty-kate removed the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Sep 7, 2023
rjbou
rjbou commented Sep 8, 2023
View reviewed changes
tests/reftests/run.ml Outdated Show resolved Hide resolved
@rjbou rjbou added this to the 2.2.0~alpha3 milestone Sep 11, 2023
@rjbou
gha: cygwin, add wget as needed for a test
98e8eb9
@rjbou
reftest: fix sed-cmd regexp to handle escaped '\'
92b2bba
@rjbou
reftest: add download test, to test OPAMFETCH & OPAMCURL handling
667b6ed
@rjbou
repository: fix OPAMFETCH/OPAMCURL handling
75a3a7a 
OPAMCURL is ignored if OPAMFETCH is set. This is changed to handle
OPAMCURL specification when OPAMFETCH is set to "curl" (simple command,
or new arguments). If OPAMFETCH is set to another tool, OPAMCURL is
ignored.
@kit-ty-kate
Copy link
Member

Thanks!

@kit-ty-kate kit-ty-kate merged commit 44d7bd9 into ocaml:master Sep 12, 2023
26 checks passed
@rjbou rjbou mentioned this pull request Sep 20, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AltGr AltGr AltGr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.2.0~alpha3
Development

Successfully merging this pull request may close these issues.

opam init using the wrong wget
3 participants
@rjbou @kit-ty-kate @AltGr