From ea813ecf56e32a64ac976c413061954b921df444 Mon Sep 17 00:00:00 2001 From: Filipe Freire Date: Fri, 31 May 2024 13:52:34 +0100 Subject: [PATCH] fix? --- .github/workflows/release-start.yml | 40 ++++++++--------------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/.github/workflows/release-start.yml b/.github/workflows/release-start.yml index f76c149bb2b..c8393cc6ad3 100644 --- a/.github/workflows/release-start.yml +++ b/.github/workflows/release-start.yml @@ -20,16 +20,6 @@ jobs: timeout-minutes: 5 runs-on: ubuntu-latest steps: - - - name: debug variables - run: | - echo "channel: ${{ github.event.inputs.channel }}" - echo "version: ${{ github.event.inputs.version }}" - echo "weird: ${{ github.event.inputs.channel != 'stable' && github.event.inputs.version && !contains(github.event.inputs.version, '-${{ github.event.inputs.channel }}') }}" - echo "weird2: ${{ github.event.inputs.channel != 'stable' }}" - echo "weird3: ${{ github.event.inputs.version }}" - echo "weird4: ${{ !contains(github.event.inputs.version, '-${{ github.event.inputs.channel }}') }}" - - name: Checkout branch uses: actions/checkout@v4 with: @@ -57,19 +47,14 @@ jobs: if: github.event.inputs.channel == 'stable' && github.event.inputs.version run: npm --workspaces version "${{ github.event.inputs.version }}" - # handle new "major" beta releases, e.g. 10.0, 11.0, 12.0 ... - - name: App version (alpha/beta, with new general version) - if: github.event.inputs.channel != 'stable' && github.event.inputs.version && !contains(github.event.inputs.version, "-${{ github.event.inputs.channel }}") - run: npm --workspaces version "${{ github.event.inputs.version }}-${{ github.event.inputs.channel }}.0" + - name: App version (stable, patch latest stable) + if: github.event.inputs.channel != 'stable' && !github.event.inputs.version + run: npm --workspaces version --preid "${{ github.event.inputs.channel }}" prerelease - # handle botched alpha/beta releases, e.g. for iterations that were merged before running release-publish - - name: App version (alpha/beta, with a specific version) - if: github.event.inputs.channel != 'stable' && github.event.inputs.version && contains(github.event.inputs.version, "-${{ github.event.inputs.channel }}") + - name: App version (stable, with a specific version) + if: github.event.inputs.channel != 'stable' && github.event.inputs.version run: npm --workspaces version "${{ github.event.inputs.version }}" - - name: App version (alpha/beta, patch latest) - if: github.event.inputs.channel != 'stable' && !github.event.inputs.version - run: npm --workspaces version --preid "${{ github.event.inputs.channel }}" prerelease # ############################################################ @@ -112,19 +97,14 @@ jobs: if: github.event.inputs.channel == 'stable' && github.event.inputs.version run: npm --workspaces version "${{ github.event.inputs.version }}" - # handle new "major" beta releases, e.g. 10.0, 11.0, 12.0 ... - - name: (Re-run) App version (alpha/beta, with new general version) - if: github.event.inputs.channel != 'stable' && ${{ github.event.inputs.version != '' }} && !contains(github.event.inputs.version, "-${{ github.event.inputs.channel }}") - run: npm --workspaces version "${{ github.event.inputs.version }}-${{ github.event.inputs.channel }}.0" + - name: (Re-run) App version (beta or alpha, patch latest beta/alpha) + if: github.event.inputs.channel != 'stable' && !github.event.inputs.version + run: npm --workspaces version --preid "${{ github.event.inputs.channel }}" prerelease - # handle botched alpha/beta releases, e.g. for iterations that were merged before running release-publish - - name: (Re-run) App version (alpha/beta, with a specific version) - if: github.event.inputs.channel != 'stable' && ${{ github.event.inputs.version != '' }} && contains(github.event.inputs.version, "-${{ github.event.inputs.channel }}") + - name: (Re-run) App version (beta or alpha, with a specific version) + if: github.event.inputs.channel != 'stable' && github.event.inputs.version run: npm --workspaces version "${{ github.event.inputs.version }}" - - name: (Re-run) App version (alpha/beta, patch latest) - if: github.event.inputs.channel != 'stable' && !github.event.inputs.version - run: npm --workspaces version --preid "${{ github.event.inputs.channel }}" prerelease # ############################################################ - name: Git Commit