From 415e48e76cb2cf4248b03db30fa99242b1acccd9 Mon Sep 17 00:00:00 2001 From: xishang0128 Date: Sat, 24 Feb 2024 05:43:22 +0800 Subject: [PATCH] 1 --- .github/workflows/build.yml | 4 ++++ hub/updater/updater.go | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21a0033745..33b47e391a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,6 +103,10 @@ jobs: tar -czvf mihomo-${GOOS}-${{matrix.jobs.output}}-${VERSION}.tar.gz mihomo fi + - name: Save version + run: echo ${VERSION} > bin/version.txt + shell: bash + - name: Archive production artifacts uses: actions/upload-artifact@v4 with: diff --git a/hub/updater/updater.go b/hub/updater/updater.go index 1967af42f9..386d85068e 100644 --- a/hub/updater/updater.go +++ b/hub/updater/updater.go @@ -26,9 +26,9 @@ import ( // modify from https://github.com/AdguardTeam/AdGuardHome/blob/595484e0b3fb4c457f9bb727a6b94faa78a66c5f/internal/updater/updater.go // Updater is the mihomo updater. var ( - goarm string - gomips string - amd64Compatible string + goarm string + gomips string + amd64 string workDir string @@ -42,15 +42,15 @@ var ( backupExeName string // 备份文件名 updateExeName string // 更新后的可执行文件 - baseURL string = "https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/mihomo" - versionURL string = "https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/version.txt" + baseURL string = "https://github.com/xishang0128/mihomo/releases/download/Prerelease-Alpha/mihomo" + versionURL string = "https://github.com/xishang0128/mihomo/releases/download/Prerelease-Alpha/version.txt" packageURL string latestVersion string ) func init() { - if runtime.GOARCH == "amd64" && cpuid.CPU.X64Level() < 3 { - amd64Compatible = "-compatible" + if runtime.GOARCH == "amd64" && cpuid.CPU.X64Level() > 2 { + amd64 = "_v3" } } @@ -136,9 +136,9 @@ func prepare(exePath string) (err error) { backupDir = filepath.Join(workDir, "meta-backup") if runtime.GOOS == "windows" { - updateExeName = "mihomo" + "-" + runtime.GOOS + "-" + runtime.GOARCH + amd64Compatible + ".exe" + updateExeName = "mihomo" + "-" + runtime.GOOS + "-" + runtime.GOARCH + amd64 + ".exe" } else { - updateExeName = "mihomo" + "-" + runtime.GOOS + "-" + runtime.GOARCH + amd64Compatible + updateExeName = "mihomo" + "-" + runtime.GOOS + "-" + runtime.GOARCH + amd64 } log.Infoln("updateExeName: %s ", updateExeName)