From 235049da13ee7bffbb72fff0a4c4bfb22510afb0 Mon Sep 17 00:00:00 2001 From: technote-space Date: Sun, 1 Mar 2020 09:47:38 +0000 Subject: [PATCH] chore: sync workflows --- .github/workflows/add-version-tag.yml | 11 ++++++-- .github/workflows/pr-opened.yml | 2 +- .github/workflows/pr-updated.yml | 31 +++++++++++++++++++++-- .github/workflows/update-dependencies.yml | 6 ++--- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/.github/workflows/add-version-tag.yml b/.github/workflows/add-version-tag.yml index f764ecc..244f1c5 100644 --- a/.github/workflows/add-version-tag.yml +++ b/.github/workflows/add-version-tag.yml @@ -13,9 +13,15 @@ jobs: if: github.event.pull_request.merged == true && github.event.pull_request.head.user.id == github.event.pull_request.base.user.id && startsWith(github.event.pull_request.head.ref, 'release/') steps: - name: Get version - run: echo "::set-env name=TAG_NAME::${HEAD_REF#release/}" + uses: technote-space/get-next-version-action@v1 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + if: "! startsWith(github.event.pull_request.head.ref, 'release/v')" + - name: Get version + run: echo "::set-env name=NEXT_VERSION::${HEAD_REF#release/}" env: HEAD_REF: ${{ github.event.pull_request.head.ref }} + if: startsWith(github.event.pull_request.head.ref, 'release/v') - uses: actions/github-script@0.4.0 with: github-token: ${{ secrets.ACCESS_TOKEN }} @@ -23,6 +29,7 @@ jobs: github.git.createRef({ owner: context.repo.owner, repo: context.repo.repo, - ref: `refs/tags/${process.env.TAG_NAME}`, + ref: `refs/tags/${process.env.NEXT_VERSION}`, sha: context.sha }) + if: env.NEXT_VERSION diff --git a/.github/workflows/pr-opened.yml b/.github/workflows/pr-opened.yml index 8f5d9d0..80d775d 100644 --- a/.github/workflows/pr-opened.yml +++ b/.github/workflows/pr-opened.yml @@ -38,7 +38,7 @@ jobs: checkVersion: name: Check package version runs-on: ubuntu-latest - if: github.event.pull_request.head.user.id == github.event.pull_request.base.user.id && startsWith(github.event.pull_request.head.ref, 'release/') + if: github.event.pull_request.head.user.id == github.event.pull_request.base.user.id && startsWith(github.event.pull_request.head.ref, 'release/v') steps: - name: Set running flag run: echo "::set-env name=RUNNING::1" diff --git a/.github/workflows/pr-updated.yml b/.github/workflows/pr-updated.yml index f59778a..0d8730a 100644 --- a/.github/workflows/pr-updated.yml +++ b/.github/workflows/pr-updated.yml @@ -36,12 +36,39 @@ jobs: manageRelease: name: Manage release runs-on: ubuntu-latest - if: github.event.pull_request.head.user.id == github.event.pull_request.base.user.id && startsWith(github.event.pull_request.head.ref, 'release/') + if: "github.event.pull_request.head.user.id == github.event.pull_request.base.user.id && startsWith(github.event.pull_request.head.ref, 'release/') && ! startsWith(github.event.pull_request.head.ref, 'release/v')" steps: - name: Manage release - uses: technote-space/manage-release-action@v1 + uses: technote-space/release-type-action@v1 with: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} EXCLUDE_MESSAGES: | update package version update packages + + checkVersion: + name: Check package version + runs-on: ubuntu-latest + if: "github.event.pull_request.head.user.id == github.event.pull_request.base.user.id && startsWith(github.event.pull_request.head.ref, 'release/') && ! startsWith(github.event.pull_request.head.ref, 'release/v')" + steps: + - name: Set running flag + run: echo "::set-env name=RUNNING::1" + - uses: actions/checkout@v2 + - name: Set running flag + run: | + if [[ ! -f package.json ]] || [[ $(< package.json jq -r '.version == null') == 'true' ]]; then + echo "::set-env name=RUNNING::" + fi + + - name: Get version + uses: technote-space/get-next-version-action@v1 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + if: env.RUNNING + - name: Check package version + uses: technote-space/package-version-check-action@v1 + with: + GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} + BRANCH_PREFIX: release/ + NEXT_VERSION: ${{ env.NEXT_VERSION }} + if: env.NEXT_VERSION diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 1b73c70..e00d508 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -25,7 +25,7 @@ jobs: PR_BRANCH_NAME: 'chore-npm-update-${PR_ID}' PR_TITLE: 'chore: update npm dependencies (${PR_MERGE_REF})' PR_DEFAULT_BRANCH_PREFIX: release/ - PR_DEFAULT_BRANCH_NAME: ${PATCH_VERSION} - PR_DEFAULT_BRANCH_TITLE: 'feat: release ${PATCH_VERSION}' + PR_DEFAULT_BRANCH_NAME: next-${CURRENT_VERSION} + PR_DEFAULT_BRANCH_TITLE: 'feat: release' TARGET_BRANCH_PREFIX: release/ - AUTO_MERGE_THRESHOLD_DAYS: 30 + AUTO_MERGE_THRESHOLD_DAYS: 14