saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix windows and mac building from without an existing onedir

Browse source
This commit is contained in:
MKLeb 2023-04-25 17:30:38 -04:00 • committed by Pedro Algarvio
parent e2a624f984
commit ae9f9d379b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/windows/build.ps1
View file

@ -167,7 +167,7 @@ if ( ! $SkipInstall ) {
Architecture = $Architecture
}
if ( $Build ) {
$KeywordArguments["Build"] = $true
$KeywordArguments["Build"] = $false
}
if ( $CICD ) {
$KeywordArguments["CICD"] = $true

4
tools/pkg/build.py
View file

@ -183,8 +183,8 @@ def macos(
assert onedir is not None
assert salt_version is not None
checkout = pathlib.Path.cwd()
if onedir:
checkout = pathlib.Path.cwd()
onedir_artifact = checkout / "artifacts" / onedir
ctx.info(f"Building package from existing onedir: {str(onedir_artifact)}")
_check_pkg_build_files_exist(ctx, onedir_artifact=onedir_artifact)
@ -279,9 +279,9 @@ def windows(
"-CICD",
]
checkout = pathlib.Path.cwd()
if onedir:
build_cmd.append("-SkipInstall")
checkout = pathlib.Path.cwd()
onedir_artifact = checkout / "artifacts" / onedir
ctx.info(f"Building package from existing onedir: {str(onedir_artifact)}")
_check_pkg_build_files_exist(ctx, onedir_artifact=onedir_artifact)