diff --git a/.github/workflows/beta_release.yml b/.github/workflows/beta_release.yml index 270118fb..90148487 100644 --- a/.github/workflows/beta_release.yml +++ b/.github/workflows/beta_release.yml @@ -93,6 +93,7 @@ jobs: run: bash build.sh dev web env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + FRONTEND_REPO: ${{ vars.FRONTEND_REPO }} - name: Build uses: OpenListTeam/cgo-actions@v1.2.2 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 708e6473..4e975d1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,7 @@ jobs: run: bash build.sh dev web env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + FRONTEND_REPO: ${{ vars.FRONTEND_REPO }} - name: Build uses: OpenListTeam/cgo-actions@v1.2.2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0dd231d6..39ab7dbc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,6 +66,7 @@ jobs: bash build.sh release ${{ matrix.build-type == 'lite' && 'lite' || '' }} ${{ matrix.target-platform }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + FRONTEND_REPO: ${{ vars.FRONTEND_REPO }} - name: Upload assets uses: softprops/action-gh-release@v2 diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml index 61ffb6e6..a5169013 100644 --- a/.github/workflows/release_docker.yml +++ b/.github/workflows/release_docker.yml @@ -66,6 +66,7 @@ jobs: run: bash build.sh release docker-multiplatform env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + FRONTEND_REPO: ${{ vars.FRONTEND_REPO }} - name: Upload artifacts uses: actions/upload-artifact@v4 @@ -105,6 +106,7 @@ jobs: run: bash build.sh release lite docker-multiplatform env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + FRONTEND_REPO: ${{ vars.FRONTEND_REPO }} - name: Upload artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index b53ac42a..c52fc6b7 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -55,6 +55,7 @@ jobs: run: bash build.sh beta docker-multiplatform env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + FRONTEND_REPO: ${{ vars.FRONTEND_REPO }} - name: Upload artifacts uses: actions/upload-artifact@v4 diff --git a/build.sh b/build.sh index 7542fd59..8f60a21f 100644 --- a/build.sh +++ b/build.sh @@ -4,6 +4,9 @@ builtAt="$(date +'%F %T %z')" gitAuthor="The OpenList Projects Contributors " gitCommit=$(git log --pretty=format:"%h" -1) +# Set frontend repository, default to OpenListTeam/OpenList-Frontend +frontendRepo="${FRONTEND_REPO:-OpenListTeam/OpenList-Frontend}" + githubAuthArgs="" if [ -n "$GITHUB_TOKEN" ]; then githubAuthArgs="--header \"Authorization: Bearer $GITHUB_TOKEN\"" @@ -25,7 +28,7 @@ else git tag -d beta || true # Always true if there's no tag version=$(git describe --abbrev=0 --tags 2>/dev/null || echo "v0.0.0") - webVersion=$(eval "curl -fsSL --max-time 2 $githubAuthArgs \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') + webVersion=$(eval "curl -fsSL --max-time 2 $githubAuthArgs \"https://api.github.com/repos/$frontendRepo/releases/latest\"" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') fi echo "backend version: $version" @@ -46,7 +49,7 @@ ldflags="\ " FetchWebRolling() { - pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/tags/rolling\"") + pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/$frontendRepo/releases/tags/rolling\"") pre_release_assets=$(echo "$pre_release_json" | jq -r '.assets[].browser_download_url') # There is no lite for rolling @@ -59,7 +62,7 @@ FetchWebRolling() { } FetchWebRelease() { - release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"") + release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/$frontendRepo/releases/latest\"") release_assets=$(echo "$release_json" | jq -r '.assets[].browser_download_url') if [ "$useLite" = true ]; then