From 7f53390dcef84eb0baf4e1ac0785791e7c747321 Mon Sep 17 00:00:00 2001 From: j2rong4cn Date: Wed, 2 Jul 2025 21:00:43 +0800 Subject: [PATCH] fix(build): version lost --- .github/workflows/beta_release.yml | 32 +++++++++++++++--------------- .github/workflows/build.yml | 19 +++++++++--------- build.sh | 10 +++++----- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/.github/workflows/beta_release.yml b/.github/workflows/beta_release.yml index 030e5473..088fd67a 100644 --- a/.github/workflows/beta_release.yml +++ b/.github/workflows/beta_release.yml @@ -2,7 +2,7 @@ name: Beta Release builds on: push: - branches: [ 'main' ] + branches: ["main"] workflow_dispatch: concurrency: @@ -16,8 +16,8 @@ jobs: changelog: strategy: matrix: - platform: [ ubuntu-latest ] - go-version: [ '1.21' ] + platform: [ubuntu-latest] + go-version: ["1.21"] name: Beta Release Changelog runs-on: ${{ matrix.platform }} steps: @@ -65,17 +65,17 @@ jobs: strategy: matrix: include: - - target: '!(*musl*|*windows-arm64*|*android*|*freebsd*)' # xgo + - target: "!(*musl*|*windows-arm64*|*android*|*freebsd*)" # xgo hash: "md5" - - target: 'linux-!(arm*)-musl*' #musl-not-arm + - target: "linux-!(arm*)-musl*" #musl-not-arm hash: "md5-linux-musl" - - target: 'linux-arm*-musl*' #musl-arm + - target: "linux-arm*-musl*" #musl-arm hash: "md5-linux-musl-arm" - - target: 'windows-arm64' #win-arm64 + - target: "windows-arm64" #win-arm64 hash: "md5-windows-arm64" - - target: 'android-*' #android + - target: "android-*" #android hash: "md5-android" - - target: 'freebsd-*' #freebsd + - target: "freebsd-*" #freebsd hash: "md5-freebsd" name: Beta Release @@ -89,7 +89,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: "1.22" - name: Setup web run: bash build.sh dev web @@ -105,11 +105,11 @@ jobs: output: openlist-$target$ext musl-base-url: "https://github.com/OpenListTeam/musl-compilers/releases/latest/download/" x-flags: | - github.com/OpenListTeam/OpenList/internal/conf.BuiltAt=$built_at - github.com/OpenListTeam/OpenList/internal/conf.GitAuthor=OpenList - github.com/OpenListTeam/OpenList/internal/conf.GitCommit=$git_commit - github.com/OpenListTeam/OpenList/internal/conf.Version=$tag - github.com/OpenListTeam/OpenList/internal/conf.WebVersion=dev + github.com/OpenListTeam/OpenList/v4/internal/conf.BuiltAt=$built_at + github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=OpenList + github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$git_commit + github.com/OpenListTeam/OpenList/v4/internal/conf.Version=$tag + github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=dev - name: Compress run: | @@ -117,7 +117,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # See above + # See above - name: Upload assets to beta release uses: softprops/action-gh-release@v2 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ece749c5..b56a8bf8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: Test Build on: push: - branches: [ 'main' ] + branches: ["main"] pull_request: - branches: [ 'main' ] + branches: ["main"] workflow_dispatch: concurrency: @@ -16,7 +16,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest] - target: + target: - darwin-amd64 - darwin-arm64 - windows-amd64 @@ -27,7 +27,6 @@ jobs: name: Build runs-on: ${{ matrix.platform }} steps: - - name: Checkout uses: actions/checkout@v4 @@ -37,7 +36,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: "1.22" - name: Setup web run: bash build.sh dev web @@ -51,11 +50,11 @@ jobs: musl-target-format: $os-$musl-$arch out-dir: build x-flags: | - github.com/OpenListTeam/OpenList/internal/conf.BuiltAt=$built_at - github.com/OpenListTeam/OpenList/internal/conf.GitAuthor=OpenList - github.com/OpenListTeam/OpenList/internal/conf.GitCommit=$git_commit - github.com/OpenListTeam/OpenList/internal/conf.Version=$tag - github.com/OpenListTeam/OpenList/internal/conf.WebVersion=dev + github.com/OpenListTeam/OpenList/v4/internal/conf.BuiltAt=$built_at + github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=OpenList + github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$git_commit + github.com/OpenListTeam/OpenList/v4/internal/conf.Version=$tag + github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=dev - name: Upload artifact uses: actions/upload-artifact@v4 diff --git a/build.sh b/build.sh index 556fa698..ff9ba12a 100644 --- a/build.sh +++ b/build.sh @@ -38,11 +38,11 @@ fi ldflags="\ -w -s \ --X 'github.com/OpenListTeam/OpenList/internal/conf.BuiltAt=$builtAt' \ --X 'github.com/OpenListTeam/OpenList/internal/conf.GitAuthor=$gitAuthor' \ --X 'github.com/OpenListTeam/OpenList/internal/conf.GitCommit=$gitCommit' \ --X 'github.com/OpenListTeam/OpenList/internal/conf.Version=$version' \ --X 'github.com/OpenListTeam/OpenList/internal/conf.WebVersion=$webVersion' \ +-X 'github.com/OpenListTeam/OpenList/v4/internal/conf.BuiltAt=$builtAt' \ +-X 'github.com/OpenListTeam/OpenList/v4/internal/conf.GitAuthor=$gitAuthor' \ +-X 'github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$gitCommit' \ +-X 'github.com/OpenListTeam/OpenList/v4/internal/conf.Version=$version' \ +-X 'github.com/OpenListTeam/OpenList/v4/internal/conf.WebVersion=$webVersion' \ " FetchWebDev() {