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

Release/9.1 #607

Merged
merged 4 commits into from
Apr 21, 2024
Merged

Release/9.1 #607

merged 4 commits into from
Apr 21, 2024

Conversation

andrews05
Copy link
Collaborator

  • Update changelog
  • Bump version
  • Regenerate manual (note the script required a tweak due to an update of terminal-size)

Changes in whitespace are due to previous changes made for mangen.

@AlexTMjugador
Copy link
Collaborator

AlexTMjugador commented Apr 15, 2024

Looks good! Before going forward with this I think I should give the deb archive changes a further look, as I have the impression that since you changed the cargo deb invocation to use the --no-build parameter it may not be necessary to install any cross-compilation toolchains.

Edit: nevermind most of the above, you stated it was needed for proper package dependency resolution by cargo deb... I wonder if there's a better solution to this.

@andrews05
Copy link
Collaborator Author

Yeah, the better solution is to wait for GitHub arm runners to be available (I believe they're currently in private beta). But I'm sure the current solution will suffice while we wait.

Just let me know when you're ready and I'll publish the release 🙂

@ace-dent
Copy link

@andrews05 I'm doing extensive testing with your palette sorting work. It is excellent, so well worth a point release! 🎉

@AlexTMjugador
Copy link
Collaborator

I've had some time to delve into the cargo deb dependencies matter, and it seems my suspicions were right. It turns out that we don't actually need the entire cross-compilation toolchain. cargo deb utilizes dpkg-shlibdeps behind the scenes to automatically resolve dependencies, and all dpkg-shlibdeps requires are the target shared libraries, which are conveniently provided by the libc6-arm64-cross and libgcc-s1-arm64-cross packages. These packages are lightweight and don't necessitate a full-blown multiarch setup. I've just pushed a commit with this enhancement, which I've tested on a x64 host within a clean Docker container.

Let's move forward with the release then! 🎉

@andrews05
Copy link
Collaborator Author

@AlexTMjugador Awesome, that looks much tidier, thanks for reworking that!

@andrews05 andrews05 merged commit 13d37a0 into shssoichiro:master Apr 21, 2024
10 checks passed
@andrews05 andrews05 deleted the release/9.1 branch April 21, 2024 20:17
@andrews05
Copy link
Collaborator Author

@AlexTMjugador We've got a problem with the cargo publish.
Source directory was modified by build.rs during cargo publish. Build scripts should not modify anything outside of OUT_DIR.
https://doc.rust-lang.org/cargo/reference/build-scripts.html#outputs-of-the-build-script

I could run it with --no-verify for now if we think that's okay but we should definitely fix this going forward.
From my research, there really isn't any good way to handle generated files right now. Some options:

  • Revert your change to the assets dir
  • Use something like xtasks or cargo-make instead of using build.rs
  • Make the manual.sh script also generate the manpage instead of using build.rs

Additionally, the deploy script didn't publish the release notes. It seems tail -n +2 need to be tail -n +3, though I'm a little confused - was this ever working? 🤔

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