diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 17d08c50..9b2d5709 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,19 +1,22 @@ -## Description: 概要 - - - -## Changes: 変更内容 - - - -## Expected Impact: 影響範囲 - - - -## Operating Requirements: 動作要件 - - - -## Additional context: 補足 - - +## Description: 概要 + + + +## Changes: 変更内容 + + + + + + +## Expected Impact: 影響範囲 + + + +## Operating Requirements: 動作要件 + + + +## Additional context: 補足 + + diff --git a/.github/workflows/add-test-tag.yml b/.github/workflows/add-test-tag.yml index 1de019bf..77568b33 100644 --- a/.github/workflows/add-test-tag.yml +++ b/.github/workflows/add-test-tag.yml @@ -13,9 +13,10 @@ jobs: - uses: actions/checkout@v2 - uses: technote-space/get-git-comment-action@v1 - name: Get version - run: echo "::set-env name=TAG_NAME::${HEAD_REF#release/}" + run: echo "::set-env name=TAG_NAME::${HEAD_REF#release/}.${RUN_ID}" env: HEAD_REF: ${{ github.event.pull_request.head.ref }} + RUN_ID: ${{ github.run_id }} if: "contains(env.COMMIT_MESSAGE, 'trigger workflow') || contains(env.COMMIT_MESSAGE, 'chore: update ')" - uses: actions/github-script@0.4.0 with: @@ -25,6 +26,6 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, ref: `refs/tags/test/${process.env.TAG_NAME}`, - sha: context.sha + sha: context.payload.pull_request.head.sha }) if: "contains(env.COMMIT_MESSAGE, 'trigger workflow') || contains(env.COMMIT_MESSAGE, 'chore: update ')" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70ba7abd..25c29e86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: run: echo "::set-env name=RUNNING::" if: "! env.GIT_DIFF" - name: Set running flag - if: matrix.node == '12' && startsWith(github.ref, 'refs/tags/') + if: matrix.node == '12' && github.ref == join('refs/heads/', github.event.repository.default_branch) run: echo "::set-env name=RUNNING::1" - name: Set running flag run: | diff --git a/.github/workflows/pr-updated.yml b/.github/workflows/pr-updated.yml index f5a175af..87972fc6 100644 --- a/.github/workflows/pr-updated.yml +++ b/.github/workflows/pr-updated.yml @@ -15,6 +15,21 @@ jobs: with: repo-token: ${{ secrets.GITHUB_TOKEN }} + history: + name: Pull Request Body + runs-on: ubuntu-latest + if: startsWith(github.event.pull_request.head.ref, 'release/') + steps: + - name: Pull Request Body + uses: technote-space/pr-commit-body-action@v1 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + EXCLUDE_MESSAGES: | + trigger workflow + Update TOC + Update package version + TITLE: '## Changes' + assignToProject: name: Assign PullRequest to Project runs-on: ubuntu-latest