From 88695b0d1f64cf5e7a1fd17ea5fd2ccfbd600255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Thu, 5 Mar 2026 21:10:45 +0800 Subject: [PATCH] Rename branches and update release workflows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit stable-next → oldstable, main-next → stable, dev-next → testing, new unstable --- .github/renovate.json | 2 +- .github/workflows/build.yml | 23 ++++++++++++----------- .github/workflows/docker.yml | 5 +++-- .github/workflows/lint.yml | 14 ++++++++------ .github/workflows/linux.yml | 5 +++-- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 78d9c9614..e24ff248b 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -6,7 +6,7 @@ ":disableRateLimiting" ], "baseBranches": [ - "dev-next" + "unstable" ], "golang": { "enabled": false diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2bd035472..3ebb2ca93 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,8 +25,9 @@ on: - publish-android push: branches: - - main-next - - dev-next + - stable + - testing + - unstable concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}-${{ inputs.build }} @@ -591,7 +592,7 @@ jobs: path: "dist" build_android: name: Build Android - if: github.event_name != 'workflow_dispatch' || inputs.build == 'All' || inputs.build == 'Android' + if: (github.event_name != 'workflow_dispatch' || inputs.build == 'All' || inputs.build == 'Android') && github.ref != 'refs/heads/oldstable' runs-on: ubuntu-latest needs: - calculate_version @@ -627,12 +628,12 @@ jobs: JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64 ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} - name: Checkout main branch - if: github.ref == 'refs/heads/main-next' && github.event_name != 'workflow_dispatch' + if: github.ref == 'refs/heads/stable' && github.event_name != 'workflow_dispatch' run: |- cd clients/android git checkout main - name: Checkout dev branch - if: github.ref == 'refs/heads/dev-next' + if: github.ref == 'refs/heads/testing' run: |- cd clients/android git checkout dev @@ -681,7 +682,7 @@ jobs: path: 'dist' publish_android: name: Publish Android - if: github.event_name == 'workflow_dispatch' && inputs.build == 'publish-android' + if: github.event_name == 'workflow_dispatch' && inputs.build == 'publish-android' && github.ref != 'refs/heads/oldstable' runs-on: ubuntu-latest needs: - calculate_version @@ -717,12 +718,12 @@ jobs: JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64 ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} - name: Checkout main branch - if: github.ref == 'refs/heads/main-next' && github.event_name != 'workflow_dispatch' + if: github.ref == 'refs/heads/stable' && github.event_name != 'workflow_dispatch' run: |- cd clients/android git checkout main - name: Checkout dev branch - if: github.ref == 'refs/heads/dev-next' + if: github.ref == 'refs/heads/testing' run: |- cd clients/android git checkout dev @@ -801,12 +802,12 @@ jobs: git tag v${{ needs.calculate_version.outputs.version }} -f echo "VERSION=${{ needs.calculate_version.outputs.version }}" >> "$GITHUB_ENV" - name: Checkout main branch - if: matrix.if && github.ref == 'refs/heads/main-next' && github.event_name != 'workflow_dispatch' + if: matrix.if && github.ref == 'refs/heads/stable' && github.event_name != 'workflow_dispatch' run: |- cd clients/apple git checkout main - name: Checkout dev branch - if: matrix.if && github.ref == 'refs/heads/dev-next' + if: matrix.if && github.ref == 'refs/heads/testing' run: |- cd clients/apple git checkout dev @@ -892,7 +893,7 @@ jobs: -authenticationKeyID $ASC_KEY_ID \ -authenticationKeyIssuerID $ASC_KEY_ISSUER_ID - name: Publish to TestFlight - if: matrix.if && matrix.name != 'macOS-standalone' && github.event_name == 'workflow_dispatch' && github.ref =='refs/heads/dev-next' + if: matrix.if && matrix.name != 'macOS-standalone' && github.event_name == 'workflow_dispatch' && github.ref =='refs/heads/testing' run: |- go run -v ./cmd/internal/app_store_connect publish_testflight ${{ matrix.platform }} - name: Build image diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 867753104..75e325832 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,8 +3,8 @@ name: Publish Docker Images on: #push: # branches: - # - main-next - # - dev-next + # - stable + # - testing release: types: - published @@ -19,6 +19,7 @@ env: jobs: build_binary: name: Build binary + if: github.event_name != 'release' || github.event.release.target_commitish != 'oldstable' runs-on: ubuntu-latest strategy: fail-fast: true diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e1485b38f..2e86bb623 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,18 +3,20 @@ name: Lint on: push: branches: - - stable-next - - main-next - - dev-next + - oldstable + - stable + - testing + - unstable paths-ignore: - '**.md' - '.github/**' - '!.github/workflows/lint.yml' pull_request: branches: - - stable-next - - main-next - - dev-next + - oldstable + - stable + - testing + - unstable jobs: build: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1238902a3..a029329c3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -3,8 +3,8 @@ name: Build Linux Packages on: #push: # branches: - # - main-next - # - dev-next + # - stable + # - testing workflow_dispatch: inputs: version: @@ -23,6 +23,7 @@ on: jobs: calculate_version: name: Calculate version + if: github.event_name != 'release' || github.event.release.target_commitish != 'oldstable' runs-on: ubuntu-latest outputs: version: ${{ steps.outputs.outputs.version }}