From 254304490cd5c0b68687319b28b123089c052752 Mon Sep 17 00:00:00 2001 From: LASER-Yi Date: Sun, 28 Mar 2021 17:07:49 +0800 Subject: [PATCH] no log: Simplify release_to_master workflow --- ..._merge.yaml => release_dev_to_master.yaml} | 40 +++++++------ .../workflows/release_minor_and_merge.yaml | 58 ------------------- .../workflows/release_patch_and_merge.yaml | 58 ------------------- 3 files changed, 22 insertions(+), 134 deletions(-) rename .github/workflows/{release_major_and_merge.yaml => release_dev_to_master.yaml} (53%) delete mode 100644 .github/workflows/release_minor_and_merge.yaml delete mode 100644 .github/workflows/release_patch_and_merge.yaml diff --git a/.github/workflows/release_major_and_merge.yaml b/.github/workflows/release_dev_to_master.yaml similarity index 53% rename from .github/workflows/release_major_and_merge.yaml rename to .github/workflows/release_dev_to_master.yaml index eab4ff06c..afabd9acc 100644 --- a/.github/workflows/release_major_and_merge.yaml +++ b/.github/workflows/release_dev_to_master.yaml @@ -1,12 +1,19 @@ -name: release_major_and_merge -on: workflow_dispatch +name: release_dev_to_master +on: + workflow_dispatch: + inputs: + increment: + description: "Increment Type (major, minor, patch)" + required: true + default: "patch" jobs: Release: runs-on: ubuntu-latest env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + UI_DIRECTORY: ./frontend + ASSET_DIRECTORY: ./__builds__ steps: - name: Validate branch if: ${{ github.ref != 'refs/heads/development' }} @@ -20,33 +27,30 @@ jobs: fetch-depth: 0 ref: development + - name: Setup Git + run: git config --global user.name "github-actions" + - name: Setup NodeJS uses: actions/setup-node@v2 with: node-version: "15.x" - - run: npm install -D release-it - - run: npm install -D @release-it/bumper - - run: npm install -D auto-changelog - - id: latest_release - uses: pozetroninc/github-action-get-latest-release@master - with: - repository: ${{ github.repository }} - excludes: prerelease, draft + - name: Install Global Tools + run: npm install -g release-it @release-it/bumper auto-changelog - - name: Define LAST_VERSION environment variable + - name: Save UI to Asset run: | - echo "LAST_VERSION=${{steps.latest_release.outputs.release}}" >> $GITHUB_ENV + mkdir -p ../.${{ env.ASSET_DIRECTORY }} && + zip -r ../.${{ env.ASSET_DIRECTORY }}/ui.zip ./ -x '*.map' -b $(mktemp -d) + working-directory: ${{ env.UI_DIRECTORY }}/build - - name: Update version and create release - uses: TheRealWaldo/release-it@v0.2.1 - with: - json-opts: '{"increment": "major"}' + - name: Create Release + run: release-it --ci --increment ${{ github.event.inputs.increment }} Merge: needs: Release runs-on: ubuntu-latest steps: - - name: Checkout source code + - name: Checkout uses: actions/checkout@v2 - name: Merge development -> master diff --git a/.github/workflows/release_minor_and_merge.yaml b/.github/workflows/release_minor_and_merge.yaml deleted file mode 100644 index 22747af24..000000000 --- a/.github/workflows/release_minor_and_merge.yaml +++ /dev/null @@ -1,58 +0,0 @@ -name: release_minor_and_merge -on: workflow_dispatch - -jobs: - Release: - runs-on: ubuntu-latest - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - steps: - - name: Validate branch - if: ${{ github.ref != 'refs/heads/development' }} - run: | - echo This action can only be run on development branch, not ${{ github.ref }} - exit 1 - - - name: Checkout source code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - ref: development - - - name: Setup NodeJS - uses: actions/setup-node@v2 - with: - node-version: "15.x" - - run: npm install -D release-it - - run: npm install -D @release-it/bumper - - run: npm install -D auto-changelog - - - id: latest_release - uses: pozetroninc/github-action-get-latest-release@master - with: - repository: ${{ github.repository }} - excludes: prerelease, draft - - - name: Define LAST_VERSION environment variable - run: | - echo "LAST_VERSION=${{steps.latest_release.outputs.release}}" >> $GITHUB_ENV - - - name: Update version and create release - uses: TheRealWaldo/release-it@v0.2.1 - with: - json-opts: '{"increment": "minor"}' - Merge: - needs: Release - runs-on: ubuntu-latest - steps: - - name: Checkout source code - uses: actions/checkout@v2 - - - name: Merge development -> master - uses: devmasx/merge-branch@v1.3.1 - with: - type: now - from_branch: development - target_branch: master - github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release_patch_and_merge.yaml b/.github/workflows/release_patch_and_merge.yaml deleted file mode 100644 index 48eaab941..000000000 --- a/.github/workflows/release_patch_and_merge.yaml +++ /dev/null @@ -1,58 +0,0 @@ -name: release_patch_and_merge -on: workflow_dispatch - -jobs: - Release: - runs-on: ubuntu-latest - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - steps: - - name: Validate branch - if: ${{ github.ref != 'refs/heads/development' }} - run: | - echo This action can only be run on development branch, not ${{ github.ref }} - exit 1 - - - name: Checkout source code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - ref: development - - - name: Setup NodeJS - uses: actions/setup-node@v2 - with: - node-version: "15.x" - - run: npm install -D release-it - - run: npm install -D @release-it/bumper - - run: npm install -D auto-changelog - - - id: latest_release - uses: pozetroninc/github-action-get-latest-release@master - with: - repository: ${{ github.repository }} - excludes: prerelease, draft - - - name: Define LAST_VERSION environment variable - run: | - echo "LAST_VERSION=${{steps.latest_release.outputs.release}}" >> $GITHUB_ENV - - - name: Update version and create release - uses: TheRealWaldo/release-it@v0.2.1 - with: - json-opts: '{"increment": "patch"}' - Merge: - needs: Release - runs-on: ubuntu-latest - steps: - - name: Checkout source code - uses: actions/checkout@v2 - - - name: Merge development -> master - uses: devmasx/merge-branch@v1.3.1 - with: - type: now - from_branch: development - target_branch: master - github_token: ${{ secrets.GITHUB_TOKEN }}