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

Change repository to use the default, upstream file layout #704

Merged
merged 19 commits into from
Oct 8, 2024

Conversation

psafont
Copy link
Member

@psafont psafont commented Oct 2, 2024

This needed changes in the tooling, as well as the newest version of opam to produce correct cache and tarballs

The change allows the tarball packaging to be directed purely by metadata, avoiding unused and duplicated packages.

This also allows users to contribute to this opam repository in a similar way to how they do to upstream repository

Updates to the repository in this new form can be seen at this branch: psafont/xs-opam@reorg...psafont:xs-opam:plusplus

@psafont psafont force-pushed the reorg branch 8 times, most recently from f2c8cad to 830f190 Compare October 7, 2024 13:28
@psafont psafont marked this pull request as ready for review October 7, 2024 13:28
Copy link
Member

@robhoes robhoes left a comment

Choose a reason for hiding this comment

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

It seems good to use the standard layout. Besides that, if it works, it works :)

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
…ture

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
…ture

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Rename upstream-extra-dummy to dev-tools

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Ideally the xapi packages would be automatically tracked, but now it's
manual through this package

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
And remove unused packages.

Some ocaml packages had to be added, they were previously ignored by the
command.

For some unknown reason dlm is considered unused, but xs-toolstack
indirectly depends on it.

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
I know it's not pretty, but there's not much choice if we want to use
opam for filtering packages and use bash to process licenses

For some reason shellcheck is happy with these cursed runes.

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
This allows to remove some accumulated workarounds because the latest
opam is used

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Now there's no need to separate between two sets of packages. Unify the
check and check all packages.

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Now it uses the opam metadata as the source of truth. It now is able to
stitch together lists of licenses to the SPDX format using AND as
separator.

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
This is opam 2.3.0~alpha1

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
@psafont psafont merged commit 407b445 into xapi-project:master Oct 8, 2024
2 checks passed
@psafont psafont deleted the reorg branch October 8, 2024 15:55
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.

3 participants