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

Allow CI to download archives from opam archive cache #4260

Merged
merged 9 commits into from
Jul 7, 2020

Conversation

dra27
Copy link
Member

@dra27 dra27 commented Jul 7, 2020

The URL for the opam cache in src_ext/Makefile was incorrect. This PR also extends make -C src_ext cache-archives to use the opam cache if upstream tarballs aren't available (this was already the case for make lib-ext, but if make -C src_ext cache-archives fails then the CI build fails...)

dra27 added 5 commits July 7, 2020 09:57
Unblocks CI when upstream tarballs aren't available.
MD5 sums were not checked in make -C src_ext cache-archives (so CI
archives were not verified).

Error reporting improved - it's now clear which tarballs were skipped on
error.

Code for downloading archives between lib-ext/lib-pkg and cache-archives
merged.
@dra27 dra27 force-pushed the correct-lib-ext-cache branch from 89170c1 to 043e047 Compare July 7, 2020 12:33
@dra27
Copy link
Member Author

dra27 commented Jul 7, 2020

This PR is running in AppVeyor with a commit which ensures that the caches are blown away to test that mode too.

dra27 added 2 commits July 7, 2020 15:23
Apparently GNU make 4 is more forgiving of poor syntax...
@dra27
Copy link
Member Author

dra27 commented Jul 7, 2020

Hmm, 5th time lucky. The macOS Travis worker re-exposed an issue spotted in #3190, but which was incorrectly fixed by updating make instead. I've atoned for my past sin, and removed the stray = in src_ext/Makefile.

@dra27 dra27 merged commit 1b645db into ocaml:master Jul 7, 2020
@dra27 dra27 deleted the correct-lib-ext-cache branch July 7, 2020 19:36
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.

1 participant