From fe59d7ffb34f2b4205dcaecad6e1fb7f9fcb1cbc Mon Sep 17 00:00:00 2001 From: ty Date: Wed, 15 Mar 2023 12:13:35 +0800 Subject: [PATCH] Revert "Fix UPX compression issue." This reverts commit 872e994fd1d611674d7be8d891d74d6ff3df479c. --- .github/workflows/build-nightly-release.yml | 2 +- .github/workflows/build-release.yml | 2 +- build/build-release | 2 +- build/build-release-zigbuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-nightly-release.yml b/.github/workflows/build-nightly-release.yml index ac118333adb0..1d4b77a8fa3d 100644 --- a/.github/workflows/build-nightly-release.yml +++ b/.github/workflows/build-nightly-release.yml @@ -44,7 +44,7 @@ jobs: fi if [[ "$compile_target" == "mips-"* || "$compile_target" == "mipsel-"* || "$compile_target" == "mips64-"* || "$compile_target" == "mips64el-"* ]]; then - wget -q https://github.com/upx/upx/releases/download/v4.0.2/upx-4.0.2-amd64_linux.tar.xz -O /tmp/upx-4.0.2.tar.xz&&mkdir -p /tmp/upx&&xz -d -c /tmp/upx-4.0.2.tar.xz | tar -x -C /tmp/upx; chmod +x /tmp/upx/upx-4.0.2-amd64_linux/upx&&export PATH=/tmp/upx/upx-4.0.2-amd64_linux:$PATH; + sudo apt-get update -y && sudo apt-get install -y upx; if [[ "$?" == "0" ]]; then compile_compress="-u" fi diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 661b1cf4a171..269cfe8badce 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -55,7 +55,7 @@ jobs: fi if [[ "$compile_target" == "mips-"* || "$compile_target" == "mipsel-"* || "$compile_target" == "mips64-"* || "$compile_target" == "mips64el-"* ]]; then - wget -q https://github.com/upx/upx/releases/download/v4.0.2/upx-4.0.2-amd64_linux.tar.xz -O /tmp/upx-4.0.2.tar.xz&&mkdir -p /tmp/upx&&xz -d -c /tmp/upx-4.0.2.tar.xz | tar -x -C /tmp/upx; chmod +x /tmp/upx/upx-4.0.2-amd64_linux/upx&&export PATH=/tmp/upx/upx-4.0.2-amd64_linux:$PATH; + sudo apt-get update -y && sudo apt-get install -y upx; if [[ "$?" == "0" ]]; then compile_compress="-u" fi diff --git a/build/build-release b/build/build-release index c65da6ce351c..73be4a2cd35f 100755 --- a/build/build-release +++ b/build/build-release @@ -38,7 +38,7 @@ fi if [[ "${use_upx}" = true ]]; then if [[ -z "$upx" ]] && command -v upx &> /dev/null; then - upx="upx --lzma --best" + upx="upx -9" fi if [[ "x$upx" == "x" ]]; then diff --git a/build/build-release-zigbuild b/build/build-release-zigbuild index 4c5aa2606e38..0cd17fa04492 100755 --- a/build/build-release-zigbuild +++ b/build/build-release-zigbuild @@ -38,7 +38,7 @@ fi if [[ "${use_upx}" = true ]]; then if [[ -z "$upx" ]] && command -v upx &> /dev/null; then - upx="upx --lzma --best" + upx="upx -9" fi if [[ "x$upx" == "x" ]]; then