Support 'from source' packaging, and using crates.io as a source #30
Conversation
|
Added fix for failing test |
|
Thank you, I'll be reviewing this tomorrow. |
| writeln!(file, "check() {{")?; | ||
| writeln!(file, " cd $pkgname-$pkgver")?; | ||
| writeln!(file, " export RUSTUP_TOOLCHAIN=stable")?; | ||
| writeln!(file, " cargo test --frozen --all-features")?; |
There was a problem hiding this comment.
For tests I agree that --all-features is probably what they want.
Note that for the builder, this will cause all dependencies to be built a second time, but if this is irritating they can build with --nocheck as supplied by makepkg and other tools.
fosskers
changed the title
|
Great job so far. A few more things and we can merge this in. We'll need to come to a decision about the approach to the flag names. |
|
Thanks for your patience on this. I'm going to put this in soon. |
| fn source_tarball(cargo_target: &Path, output: &Path, config: &Config) -> Result<(), Error> { | ||
| let args = ["publish", "--dry-run", "--allow-dirty"]; | ||
| let status = Command::new("cargo").args(args).status()?; |
There was a problem hiding this comment.
What if, instead of building the tarball ourselves, we pull one automatically based on a release tag? That's the strategy I use for Aura's main package on the AUR.
There was a problem hiding this comment.
That should be OK, this will require author to publish to github using the exact tag format we are expecting so that we can then pull it to generate the checksums. Are you OK with that? I was worried that it was kind of an implicit behaviour that would need extra documentation, particularly since it deviates from the default. Dare I say it but I feel like this would have been a use case for source=url
There was a problem hiding this comment.
the exact tag format we are expecting
Isn't the tag format uniform, at least with Github? Always something like v1.2.3?
There was a problem hiding this comment.
Github tags are free text entry - here's an example of one I made up on a spare repository.
https://github.com/nick42d/ratatuirepro/releases/tag/version-1.501.22
| (true, false) => { | ||
| let crate_file = crates::CrateFile::download_new(&config)?; | ||
| let built_crate_file = crate_file.build(args.musl)?; | ||
| let license = built_crate_file.tarball(&cargo_target)?; | ||
| let sha256 = sha256sum(&config.package, &output)?; | ||
| (sha256, license) | ||
| } |
There was a problem hiding this comment.
This variation is unfortunately failing for me with the message:
:: Stripping binary...
:: Packing tarball...
:: Error: No such file or directory (os error 2)
It also seems to download a tarball to target/ and not target/cargo-aur/.
There was a problem hiding this comment.
Please try change 'version' in Cargo.toml to 1.7.1 if you haven't already. 1.7.2 will fail as it's not on crates.io yet.
| (false, true) => { | ||
| source_tarball(&cargo_target, &output, &config)?; | ||
| let license = alert_if_must_copy_license(&config.package.license) | ||
| .then(|| license_file(None)) | ||
| .transpose()?; | ||
| let sha256 = sha256sum(&config.package, &output)?; | ||
| (sha256, license) | ||
| } |
There was a problem hiding this comment.
This variant seems to produce a PKGBUILD that refers to a source with a different filename than the one produced by the build/packaging process. See my other comment about a potential shift in strategy for this variant.
There was a problem hiding this comment.
I have resolved this now, apologies.
| (false, false) => { | ||
| release_build(args.musl)?; | ||
| let license = alert_if_must_copy_license(&config.package.license) | ||
| .then(|| license_file(None)) | ||
| .transpose()?; | ||
| tarball(args.musl, &cargo_target, &output, license.as_ref(), &config)?; | ||
| let sha256 = sha256sum(&config.package, &output)?; | ||
| (sha256, license) | ||
| } | ||
| }; |
There was a problem hiding this comment.
The default - appears to work without issue.
|
Hi there, please forgive the delay, I'm currently out of town for a wedding. |
Added new flags
--no-binand--source.Existing behaviour is
--source project.New options
--source crates-io --no-binDownload crate from crates.io, get it's checksum, and write a PKGBUILD that downloads and builds from crates.io. No tarball is produced.
Example PKGBUILD
https://gist.github.com/nick42d/6ce7809a0b24444aaccf9655811cb750
--source crates-ioDownload crate from crates.io, and create a binary release tarball in
target/cargo-aur. Write a PKGBUILD that assumes user will upload binary release tarball to github/gitlabExample PKGBUILD
https://gist.github.com/nick42d/dfe9e652473370671fecae9bce2d84fd
--source project --no-binPackage the source code of the project to a source tarball in
target/cargo-aur. Write a PKGBUILD that assumes user will upload source tarball to github/gitlabExample PKGBUILD
https://gist.github.com/nick42d/e441adb325c01cbbee68c835bfe58e3b
This change should be non-breaking as
--sourcedefaults toprojectso I put this as a minor version bump. However, you could consider a major version bump due to the new functionality.Testing note: the version number in Cargo.toml is used to download the .crate. If you try and run
--source crates.iowithversion = "1.7.2"this will fail since 1.7.2 isn't uploaded to crates.io yet. Change version to 1.7.1 to test the new flags.