xm/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2026-03-10 23:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

~修复自动编译失败的问题，arm64和amd64内核upx压缩版本改为5.1.0

Browse Source
This commit is contained in:
juewuy
2026-01-15 18:32:03 +08:00
parent cb38a98332
commit b3d2c8af69
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
.github/workflows/update_meta_core.yaml vendored
View File

@@ -64,8 +64,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: go needs: go
env: env:
REPO: ${{ github.event.inputs.tag1 }} REPO: ${{ inputs.tag1 }}
TAGS: ${{ github.event.inputs.tag5 }} TAGS: ${{ inputs.tag5 }}
outputs: outputs:
version: ${{steps.meta.outputs.version}} version: ${{steps.meta.outputs.version}}
tags: ${{steps.meta.outputs.tags}} tags: ${{steps.meta.outputs.tags}}
@@ -74,7 +74,7 @@ jobs:
- name: get meta version - name: get meta version
id: meta id: meta
run: | run: |
version=${{ github.event.inputs.tag2 }} version=${{ inputs.tag2 }}
[ "$version" = Alpha ] && version="Alpha-$(date +"%Y%m%d")" [ "$version" = Alpha ] && version="Alpha-$(date +"%Y%m%d")"
echo version=$version >> $GITHUB_OUTPUT echo version=$version >> $GITHUB_OUTPUT
if [ -z "$TAGS" ];then if [ -z "$TAGS" ];then
@@ -137,8 +137,8 @@ jobs:
- name: Checkout meta - name: Checkout meta
uses: actions/checkout@v5 uses: actions/checkout@v5
with: with:
repository: ${{ github.event.inputs.tag1 }} repository: ${{ inputs.tag1 }}
ref: ${{ github.event.inputs.tag2 }} ref: ${{ inputs.tag2 }}
fetch-depth: 1 fetch-depth: 1
- name: Setup Go - name: Setup Go
@@ -188,11 +188,11 @@ jobs:
- name: Zip core by upx - name: Zip core by upx
if: env.ZIPTYPE == 'upx' if: env.ZIPTYPE == 'upx'
run: | run: |
wget https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz for upxv in 3.94 3.96 5.1.0;do
wget https://github.com/upx/upx/releases/download/v3.94/upx-3.94-amd64_linux.tar.xz wget https://github.com/upx/upx/releases/download/v$upxv/upx-$upxv-amd64_linux.tar.xz
tar xf upx-3.96-amd64_linux.tar.xz tar xf upx-$upxv-amd64_linux.tar.xz
tar xf upx-3.94-amd64_linux.tar.xz done
for arch in amd64 armv5 armv7 arm64 386 mips-softfloat mipsle-hardfloat mipsle-softfloat;do for arch in amd64 armv5 armv7 arm64 386 mips-softfloat mipsle-hardfloat mipsle-softfloat;do
[ ! -f ./tmp/linux-${arch}/meta ] && continue [ ! -f ./tmp/linux-${arch}/meta ] && continue
mv -f ./tmp/linux-${arch}/meta ./tmp/clash-linux-${arch}.upx mv -f ./tmp/linux-${arch}/meta ./tmp/clash-linux-${arch}.upx
@@ -201,12 +201,15 @@ jobs:
armv5|mips* ) armv5|mips* )
./upx-3.94-amd64_linux/upx --no-lzma ./tmp/clash-linux-${arch}.upx ./upx-3.94-amd64_linux/upx --no-lzma ./tmp/clash-linux-${arch}.upx
;; ;;
*) armv7|386)
./upx-3.96-amd64_linux/upx --no-lzma ./tmp/clash-linux-${arch}.upx ./upx-3.96-amd64_linux/upx --no-lzma ./tmp/clash-linux-${arch}.upx
;; ;;
*)
./upx-5.1.0-amd64_linux/upx ./tmp/clash-linux-${arch}.upx
;;
esac esac
done done
rm -rf upx-3.9* rm -rf upx-*
- name: Zip core by tar - name: Zip core by tar
if: env.ZIPTYPE == 'tar.gz' if: env.ZIPTYPE == 'tar.gz'
@@ -250,9 +253,9 @@ jobs:
if: ${{ env.RELEASE != '' && env.PUSHDIR == '' }} if: ${{ env.RELEASE != '' && env.PUSHDIR == '' }}
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
tag_name: ${{ github.event.inputs.tag3 }} tag_name: ${{ inputs.tag3 }}
name: ${{ github.event.inputs.tag3 }} name: ${{ inputs.tag3 }}
body: "The ${{env.VERSION}} version of ${{ github.event.inputs.tag1 }} \n这是${{ github.event.inputs.tag1 }}的${{env.VERSION}}版本内核文件\nhttps://github.com/${{ github.event.inputs.tag1 }}/releases \nOnly support for ShellCrash\n仅适配ShellCrash项目" body: "The ${{env.VERSION}} version of ${{ inputs.tag1 }} \n这是${{ inputs.tag1 }}的${{env.VERSION}}版本内核文件\nhttps://github.com/${{ inputs.tag1 }}/releases \nOnly support for ShellCrash\n仅适配ShellCrash项目"
draft: false draft: false
prerelease: true prerelease: true
files: | files: |

17
.github/workflows/update_singbox_core.yaml vendored
View File

@@ -208,24 +208,27 @@ jobs:
- name: Zip core by upx - name: Zip core by upx
if: env.ZIPTYPE == 'upx' if: env.ZIPTYPE == 'upx'
run: | run: |
wget https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz for upxv in 3.94 3.96 5.1.0;do
wget https://github.com/upx/upx/releases/download/v3.94/upx-3.94-amd64_linux.tar.xz wget https://github.com/upx/upx/releases/download/v$upxv/upx-$upxv-amd64_linux.tar.xz
tar xf upx-3.96-amd64_linux.tar.xz tar xf upx-$upxv-amd64_linux.tar.xz
tar xf upx-3.94-amd64_linux.tar.xz done
for arch in amd64 armv5 armv7 arm64 386 mips-softfloat mipsle-hardfloat mipsle-softfloat;do for arch in amd64 armv5 armv7 arm64 386 mips-softfloat mipsle-hardfloat mipsle-softfloat;do
[ ! -f ./tmp/linux-${arch}/sing-box ] && continue [ ! -f ./tmp/linux-${arch}/sing-box ] && continue
mv -f ./tmp/linux-${arch}/sing-box ./tmp/singbox-linux-${arch}.upx mv -f ./tmp/linux-${arch}/sing-box ./tmp/singbox-linux-${arch}.upx
chmod +x ./tmp/singbox-linux-${arch}.upx chmod +x ./tmp/singbox-linux-${arch}.upx
case "${arch}" in case "${arch}" in
armv5|mips* ) armv5|mips* )
./upx-3.94-amd64_linux/upx --no-lzma ./tmp/singbox-linux-${arch}.upx ./upx-3.94-amd64_linux/upx --no-lzma ./tmp/clash-linux-${arch}.upx
;;
armv7|386)
./upx-3.96-amd64_linux/upx --no-lzma ./tmp/clash-linux-${arch}.upx
;; ;;
*) *)
./upx-3.96-amd64_linux/upx --no-lzma ./tmp/singbox-linux-${arch}.upx ./upx-5.1.0-amd64_linux/upx ./tmp/clash-linux-${arch}.upx
;; ;;
esac esac
done done
rm -rf upx-3.9* rm -rf upx-*
- name: Zip core by tar - name: Zip core by tar
if: env.ZIPTYPE == 'tar.gz' if: env.ZIPTYPE == 'tar.gz'