Skip to content

Commit

Permalink
Fix incorrect xz log warning in make release (#2044)
Browse files Browse the repository at this point in the history
  • Loading branch information
trss authored Dec 25, 2021
1 parent 7918c1c commit f453625
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Configurations/make-release-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ if [ "$ACTION" = "" ] ; then
cp -R "$CONFIGURATION_BUILD_DIR/staging/bin" "$CONFIGURATION_BUILD_DIR/staging-spm"

cd "$CONFIGURATION_BUILD_DIR/staging"

if [ -x "$(command -v xz)" ]; then
XZ_EXISTS=1
else
XZ_EXISTS=0
fi

rm -rf "/tmp/sparkle-extract"
mkdir -p "/tmp/sparkle-extract"

Expand All @@ -88,7 +88,7 @@ if [ "$ACTION" = "" ] ; then

rm -rf "/tmp/sparkle-extract"
rm -rf "$CONFIGURATION_BUILD_DIR/staging"

# Generate zip containing the xcframework for SPM
rm -rf "/tmp/sparkle-spm-extract"
mkdir -p "/tmp/sparkle-spm-extract"
Expand All @@ -100,7 +100,7 @@ if [ "$ACTION" = "" ] ; then
# This guards against our archives being corrupt / created incorrectly
ditto -x -k "../Sparkle-for-Swift-Package-Manager.zip" "/tmp/sparkle-spm-extract"
verify_code_signatures "/tmp/sparkle-spm-extract"

rm -rf "/tmp/sparkle-spm-extract"
rm -rf "$CONFIGURATION_BUILD_DIR/staging-spm"

Expand Down Expand Up @@ -138,10 +138,10 @@ if [ "$ACTION" = "" ] ; then
else
echo "warning: Xcode version $XCODE_VERSION_ACTUAL does not support computing checksums for Swift Packages. Please update the Package manifest manually."
fi
if [ "$XZ_EXISTS" -eq 1 ] ; then

if [ "$XZ_EXISTS" -ne 1 ] ; then
echo "WARNING: xz compression is used for official releases but bz2 is being used instead because xz tool is not installed on your system."
fi

rm -rf "$CONFIGURATION_BUILD_DIR/staging-spm"
fi

0 comments on commit f453625

Please sign in to comment.