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.

Sign up for GitHub

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

CI: Clean up win-x64 package pipeline #2755

Merged
merged 2 commits into from
Jan 5, 2024
Merged

CI: Clean up win-x64 package pipeline #2755

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e2a567
Better fix
sieniven Dec 19, 2023
e2f662e
Remove whitespace
sieniven Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ package() {
local pkg_path
if [[ "$target" == "x86_64-w64-mingw32" ]]; then
pkg_path="$(_canonicalize "${build_dir}/${pkg_name}.zip")"
else
else
pkg_path="$(_canonicalize "${build_dir}/${pkg_name}.tar.gz")"
fi

Expand All @@ -241,11 +241,8 @@ package() {
echo "> packaging: ${pkg_name} from ${versioned_build_dir}"

if [[ "$target" == "x86_64-w64-mingw32" ]]; then
_ensure_enter_dir "${versioned_build_dir}"
cd ..
local dir_to_zip
dir_to_zip=$(basename "${versioned_build_dir}")
zip -r "${pkg_path}" "${dir_to_zip}/"
_ensure_enter_dir "${build_dir}"
zip -r "${pkg_path}" "$(basename "${versioned_build_dir}")"
else
_ensure_enter_dir "${versioned_build_dir}"
_tar --transform "s,^./,${versioned_name}/," -czf "${pkg_path}" ./*
Expand Down
Loading