diff --git a/.github/workflows/update_meta_core.yaml b/.github/workflows/update_meta_core.yaml index 4393753d..c48c8009 100644 --- a/.github/workflows/update_meta_core.yaml +++ b/.github/workflows/update_meta_core.yaml @@ -119,22 +119,6 @@ jobs: uses: actions/setup-go@v6 with: go-version: ${{needs.go.outputs.version}} - - - name: Set variables - run: | - VERSION="${GITHUB_REF_NAME,,}-$(git rev-parse --short HEAD)" - VERSION="${VERSION//\//-}" - PackageVersion="$(curl -s "https://api.github.com/repos/MetaCubeX/mihomo/releases/latest" | jq -r '.tag_name' | sed 's/v//g' | awk -F '.' '{$NF = $NF + 1; print}' OFS='.').${VERSION/-/.}" - if [ -n "${{ github.event.inputs.version }}" ]; then - VERSION=${{ github.event.inputs.version }} - PackageVersion="${VERSION#v}" - fi - echo "VERSION=${VERSION}" >> $GITHUB_ENV - echo "PackageVersion=${PackageVersion}" >> $GITHUB_ENV - echo "BUILDTIME=$(date)" >> $GITHUB_ENV - echo "CGO_ENABLED=0" >> $GITHUB_ENV - echo "BUILDTAG=-extldflags --static" >> $GITHUB_ENV - echo "GOTOOLCHAIN=local" >> $GITHUB_ENV - name: Update CA run: | @@ -145,8 +129,8 @@ jobs: - name: build core id: build run: | - go env - go build -v -tags "${TAGS}" -o meta -trimpath -ldflags "${BUILDTAG} -X 'github.com/metacubex/mihomo/constant.Version=${VERSION}' -X 'github.com/metacubex/mihomo/constant.BuildTime=${BUILDTIME}' -w -s -buildid=" + go build -v -tags "${TAGS}" -o meta -trimpath -ldflags "-extldflags --static -X 'github.com/metacubex/mihomo/constant.Version=${VERSION}' -X 'github.com/metacubex/mihomo/constant.BuildTime=$(date)' -w -s -buildid=" + - name: Upload file to workspace uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/update_singbox_core.yaml b/.github/workflows/update_singbox_core.yaml index 2e963a30..922a3c10 100644 --- a/.github/workflows/update_singbox_core.yaml +++ b/.github/workflows/update_singbox_core.yaml @@ -117,11 +117,11 @@ jobs: goos: linux goarch: mips gomips: softfloat - - name: linux-mipsel-softfloat + - name: linux-mipsle-softfloat goos: linux goarch: mipsle gomips: softfloat - - name: linux-mipsel-hardfloat + - name: linux-mipsle-hardfloat goos: linux goarch: mipsle gomips: hardfloat @@ -195,17 +195,36 @@ jobs: with: path: ./tmp + - name: Zip core by upx + if: endsWith(env.PUSHDIR, '_upx') + run: | + wget https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz + wget https://github.com/upx/upx/releases/download/v3.94/upx-3.94-amd64_linux.tar.xz + tar xf upx-3.96-amd64_linux.tar.xz + tar xf upx-3.94-amd64_linux.tar.xz + for arch in amd64 armv5 armv7 arm64 386 mips-softfloat mipsle-hardfloat mipsle-softfloat;do + [ ! -f ./tmp/linux-${arch}/sing-box ] && continue + mv -f ./tmp/linux-${arch}/sing-box ./tmp/singbox-linux-${arch}.upx + chmod +x ./tmp/singbox-linux-${arch}.upx + case "${arch}" in + armv5|mips* ) + ./upx-3.94-amd64_linux/upx -9 --no-lzma ./tmp/singbox-linux-${arch}.upx + ;; + *) + ./upx-3.96-amd64_linux/upx --no-lzma ./tmp/singbox-linux-${arch}.upx + ;; + esac + done + - name: Zip core by tar - run: | - for arch in amd64 armv5 armv7 arm64 386 mips-softfloat mipsel-hardfloat mipsel-softfloat;do + if: ${{ !endsWith(env.PUSHDIR, '_upx') }} + run: | + for arch in amd64 armv5 armv7 arm64 386 mips-softfloat mipsle-hardfloat mipsle-softfloat;do [ ! -f ./tmp/linux-${arch}/sing-box ] && continue mv -f ./tmp/linux-${arch}/sing-box ./tmp/CrashCore chmod +x ./tmp/CrashCore tar --no-same-owner -zcvf ./tmp/singbox-linux-${arch}.tar.gz -C ./tmp CrashCore done - mv -f ./tmp/singbox-linux-mipsel-hardfloat.tar.gz ./tmp/singbox-linux-mipsle-hardfloat.tar.gz - mv -f ./tmp/singbox-linux-mipsel-softfloat.tar.gz ./tmp/singbox-linux-mipsle-softfloat.tar.gz - echo ${VERSION} > ./tmp/version - name: Commit and push if: ${{ env.PUSHDIR != '' }}