Skip to content

Commit 64ff6bb

Browse files
authored
Merge branch 'shadowsocks:master' into patch-rust-utun
2 parents 536c99b + 7ab8844 commit 64ff6bb

File tree

5 files changed

+49
-56
lines changed

5 files changed

+49
-56
lines changed

.github/workflows/build-nightly-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fi
4646
4747
if [[ "$compile_target" == "mips-"* || "$compile_target" == "mipsel-"* || "$compile_target" == "mips64-"* || "$compile_target" == "mips64el-"* ]]; then
48-
sudo apt-get update -y && sudo apt-get install -y upx;
48+
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;
4949
if [[ "$?" == "0" ]]; then
5050
compile_compress="-u"
5151
fi

.github/workflows/build-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
fi
5757
5858
if [[ "$compile_target" == "mips-"* || "$compile_target" == "mipsel-"* || "$compile_target" == "mips64-"* || "$compile_target" == "mips64el-"* ]]; then
59-
sudo apt-get update -y && sudo apt-get install -y upx;
59+
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;
6060
if [[ "$?" == "0" ]]; then
6161
compile_compress="-u"
6262
fi

Cargo.lock

Lines changed: 45 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/build-release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fi
3838

3939
if [[ "${use_upx}" = true ]]; then
4040
if [[ -z "$upx" ]] && command -v upx &> /dev/null; then
41-
upx="upx -9"
41+
upx="upx --lzma --best"
4242
fi
4343

4444
if [[ "x$upx" == "x" ]]; then

build/build-release-zigbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fi
3838

3939
if [[ "${use_upx}" = true ]]; then
4040
if [[ -z "$upx" ]] && command -v upx &> /dev/null; then
41-
upx="upx -9"
41+
upx="upx --lzma --best"
4242
fi
4343

4444
if [[ "x$upx" == "x" ]]; then

0 commit comments

Comments
 (0)