-
Notifications
You must be signed in to change notification settings - Fork 3
Chore: Final bump to scaffolding 0.600.1, remove hc-launch #238
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
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the ✨ Finishing touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
mattyg
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- hc-scaffold 0.600.1 released, so we can switch to that tag
- hc-launch will be deprecated in 0.6 and can be removed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All this
Lines 224 to 277 in d7e5f91
| # define how to build hc-launch binary | |
| hc-launch = | |
| let | |
| # Crane filters out all non-cargo related files. Define include filter with files needed for build. | |
| nonCargoBuildFiles = path: _type: builtins.match ".*(js|json|png)$" path != null; | |
| includeFilesFilter = path: type: | |
| (craneLib.filterCargoSources path type) || (nonCargoBuildFiles path type); | |
| # Crane doesn't know which version to select from a workspace, so we tell it where to look | |
| crateInfo = craneLib.crateNameFromCargoToml { cargoToml = inputs.hc-launch + "/crates/hc_launch/src-tauri/Cargo.toml"; }; | |
| commonArgs = { | |
| pname = "hc-launch"; | |
| version = crateInfo.version; | |
| # Use hc-launch sources as defined in input dependencies and include only those files defined in the | |
| # filter previously. | |
| src = pkgs.lib.cleanSourceWith { | |
| src = inputs.hc-launch; | |
| filter = includeFilesFilter; | |
| }; | |
| # Only build hc-launch command | |
| cargoExtraArgs = "--bin hc-launch"; | |
| # commands required at build time | |
| nativeBuildInputs = ( | |
| if pkgs.stdenv.isLinux then [ pkgs.pkg-config ] | |
| else [ ] | |
| ); | |
| # build inputs required for linking to execute at runtime | |
| buildInputs = [ | |
| pkgs.perl | |
| ] | |
| ++ (pkgs.lib.optionals pkgs.stdenv.isLinux | |
| [ | |
| pkgs.glib | |
| pkgs.go | |
| pkgs.webkitgtk_4_0.dev | |
| ]); | |
| # do not check built package as it either builds successfully or not | |
| doCheck = false; | |
| }; | |
| # derivation building all dependencies | |
| deps = craneLib.buildDepsOnly commonArgs; | |
| in | |
| # derivation with the main crates | |
| craneLib.buildPackage | |
| (commonArgs // { | |
| cargoArtifacts = deps; | |
| stdenv = p: p.stdenv; | |
| }); |
and every occurrence of hc-launch has to be removed as well.
|
@jost-s okay, here's a new commit with every instance I could find of hc-launch removed. I notice there's a bit of stuff related to updating Launcher in the |
|
@pdaoust Yes, as you already did, and please delete these sections too: holonix/.github/workflows/holonix-update.yaml Lines 27 to 31 in eceb323
holonix/.github/workflows/holonix-update.yaml Lines 45 to 48 in eceb323
|
|
✔️ 4380dcd...f1fadcf - Conventional commits check succeeded. |
jost-s
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
mattyg
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I realized that we we want to remove hc-launch on main as well.
Usually we would do a PR to main, and then backport it to main-0.6.
Maybe if its easier this time lets just merge this and then make a separate PR to remove hc-launch from main
Sorry I should have caught this last time.
This gets
flake.lockto the commit of scaffolding0.600.0v0.600.1 that scaffolds a nix flake that uses all the most up-to-date tools. It also removes the deprecatedhc-launchcommand.