-
Notifications
You must be signed in to change notification settings - Fork 173
Fixes for #1188; custom_commands
broken
#1230
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
base: main
Are you sure you want to change the base?
Conversation
Never mind, I cannot merge this myself. @SteveLauC could you review and merge as soon as possible? |
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.
IMO, I prefer the way step ordering was defined before #1188, with separate blocks for each OS, even if they have overlap. It makes it easier to see at a glance which steps will be run for each OS.
So I think the system-specific section of default_steps()
should look more like this:
#[cfg(windows)]
steps.extend_from_slice(&[Wsl, WslUpdate, Chocolatey, Scoop, Winget, System, MicrosoftStore]);
#[cfg(target_os = "macos")]
steps.extend_from_slice(&[BrewFormula, BrewCask, Macports, Xcodes, Sparkle, Mas, System]);
#[cfg(target_os = "dragonfly")]
steps.extend_from_slice(&[Pkg, Audit]);
#[cfg(target_os = "freebsd")]
steps.extend_from_slice(&[Pkg, System, Audit]);
#[cfg(target_os = "openbsd")]
steps.extend_from_slice(&[Pkg, System]);
#[cfg(target_os = "android")]
steps.push(System);
#[cfg(target_os = "linux")]
steps.extend_from_slice(&[
System,
ConfigUpdate,
AM,
AppMan,
DebGet,
Toolbx,
Snap,
Pacstall,
Pacdef,
Protonup,
Distrobox,
DkpPacman,
Firmware,
Restarts,
Flatpak,
BrewFormula,
Lure,
Waydroid,
AutoCpufreq,
CinnamonSpices,
]);
So even though the System
step is duplicated several times, it is really easy to see the list of steps that any particular system will run.
I agree actually, I did not realize that #1188 added any overlap, I thought that was there before. I noticed "android" should run |
Good spots. Having the |
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 👍
@themadprofessor You had some mistakes in #1188 which we both didn't spot:
CustomCommands
is broken and runningpre_commands
instead.NixHelper
andRemotes
are missing fromdefault_steps
Pkg
is missing fromdefault_steps
ontarget_os = "android"
A few other changes:
*self
where I could.step-enum-sorted
andstep-match-sorted
intocustom-checks
default_steps
custom check to check if it contains every stepdefault_steps
to contain less overlappingcfg
calls@themadprofessor please review when you can.