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

Opam pin depends refactors #831

Closed
wants to merge 2 commits into from
Closed

Opam pin depends refactors #831

wants to merge 2 commits into from

Conversation

MisterDA
Copy link
Contributor

Follow-up to #791 and fix #826.
ocaml-ci itself uses git and tar pin-depends, if it builds correctly the changes are (likely) correct too!

@MisterDA
Refactor pin-depends
ac9714e 
Share common code.
When scanning tar archives, always keep the last entry if the filename
is found multiple times (tar is an append-only filesystem). If entries
for multiple names are found, introduce a concept of priority and keep
the better one.
@MisterDA
Also look for files named 'opam' in pin-depends
ce9a218 
Compatibillity with topkg/brr/oasis, where the opam file is simply
named 'opam'.
@benmandrew
Copy link
Contributor

I ran on my own fork of OCaml-CI (benmandrew/ocaml-ci) and had some failures:

On the master branch I had:

2023-06-26 16:26.06: ocaml-ci-web.dev: found pin-depends: tailwindcss.~dev -> https://github.com/tmattio/opam-tailwindcss/archive/f0d65be5f94322f48497b33bc05c057882d57977.tar.gz
2023-06-26 16:26.06: ocaml-ci-web.dev: found pin-depends: tailwindcss.~dev -> https://github.com/tmattio/opam-tailwindcss/archive/f0d65be5f94322f48497b33bc05c057882d57977.tar.gz
2023-06-26 16:26.06: Job failed: Tar.Header.Checksum_mismatch

On the keep-capnp-secrets branch the analysis succeeded (along with the builds) but there appears to have been some non-fatal errors:

2023-06-26 16:26.03: ocaml-ci-web.dev: found pin-depends: tailwindcss.dev -> git+https://github.com/tmattio/opam-tailwindcss#f0d65be5f94322f48497b33bc05c057882d57977
2023-06-26 16:26.03: Exec: "git" "-C" "/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c" 
                           "show" "f0d65be5f94322f48497b33bc05c057882d57977:tailwindcss.opam"
2023-06-26 16:26.03: ocaml-ci-web.dev: found pin-depends: tailwindcss.dev -> git+https://github.com/tmattio/opam-tailwindcss#f0d65be5f94322f48497b33bc05c057882d57977
2023-06-26 16:26.03: Exec: "git" "-C" "/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c" 
                           "show" "f0d65be5f94322f48497b33bc05c057882d57977:tailwindcss.opam"
fatal: cannot change to '/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c': No such file or directory
2023-06-26 16:26.03: Exec: "git" "-C" "/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c" 
                           "show" "f0d65be5f94322f48497b33bc05c057882d57977:opam/tailwindcss.opam"
fatal: cannot change to '/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c': No such file or directory
fatal: cannot change to '/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c': No such file or directory
2023-06-26 16:26.03: Exec: "git" "-C" "/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c" 
                           "show" "f0d65be5f94322f48497b33bc05c057882d57977:opam/tailwindcss.opam"
2023-06-26 16:26.03: Exec: "git" "-C" "/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c" 
                           "show" "f0d65be5f94322f48497b33bc05c057882d57977:opam"
fatal: cannot change to '/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c': No such file or directory
2023-06-26 16:26.03: Exec: "git" "-C" "/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c" 
                           "show" "f0d65be5f94322f48497b33bc05c057882d57977:opam"
fatal: cannot change to '/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c': No such file or directory
2023-06-26 16:26.03: Exec: "git" "clone" "-q" "https://github.com/tmattio/opam-tailwindcss" 
                           "/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c"
fatal: cannot change to '/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c': No such file or directory
2023-06-26 16:26.57: Exec: "git" "-C" "/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c" 
                           "show" "f0d65be5f94322f48497b33bc05c057882d57977:tailwindcss.opam"
2023-06-26 16:26.57: Exec: "git" "-C" "/Users/benmandrew/projects/t/ocaml-ci/var/pin-depends/opam-tailwindcss-15d4d53849bf40e63de281bc9ea2f28c" 
                           "fetch"

@MisterDA
Copy link
Contributor Author

Well then I'll write tests and inspect what's going on.
Thank you very much for trying this!

@shonfeder
Copy link
Contributor

Please feel free to reopen this is you resume work on it!

@shonfeder shonfeder closed this Jul 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

OCaml-CI should search for opam file names in pin-depends or vendored git submodules
3 participants
@MisterDA @benmandrew @shonfeder