From 0f5878dede22aceabb3d29223deb40470d926241 Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Wed, 20 May 2020 05:39:37 +0200 Subject: [PATCH] Changelog ignore commits with word changelog, FIX: last changes not included in latest branch --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/publish.yaml | 7 +++++-- .github/workflows/template_initialization.yaml | 4 ++-- README.template.md | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 30f8c14..74c6e16 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - name: Get version on branch 'latest' id: v_latest - uses: garronej/github_actions_toolkit@v1 + uses: garronej/github_actions_toolkit@v1.1 with: action_name: get_package_json_version owner: ${{github.repository_owner}} @@ -49,7 +49,7 @@ jobs: - name: Get version on master id: v_master - uses: garronej/github_actions_toolkit@v1 + uses: garronej/github_actions_toolkit@v1.1 with: action_name: get_package_json_version owner: ${{github.repository_owner}} @@ -59,7 +59,7 @@ jobs: - name: 'Trigger the ''publish'' workflow if newer version' if: ${{ !!env.PAT && steps.v_master.outputs.compare_result == '1' }} - uses: garronej/github_actions_toolkit@v1 + uses: garronej/github_actions_toolkit@v1.1 env: GITHUB_TOKEN: ${{ secrets.PAT }} with: diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index dd0d513..ec2ac13 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Synchronize package.json and package-lock.json version if needed. - uses: garronej/github_actions_toolkit@v1 + uses: garronej/github_actions_toolkit@v1.1 env: GITHUB_TOKEN: ${{ secrets.PAT }} with: @@ -19,7 +19,7 @@ jobs: commit_author_email: ts_ci@github.com - name: Update CHANGELOG.md if: ${{ !!github.event.client_payload.from_version }} - uses: garronej/github_actions_toolkit@v1 + uses: garronej/github_actions_toolkit@v1.1 env: GITHUB_TOKEN: ${{ secrets.PAT }} with: @@ -38,6 +38,9 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 + ref: master + - name: Remove .github directory, useless on 'latest' branch + run: rm -r .github - name: Remove branch 'latest' continue-on-error: true run: | diff --git a/.github/workflows/template_initialization.yaml b/.github/workflows/template_initialization.yaml index 52d0672..b969e81 100644 --- a/.github/workflows/template_initialization.yaml +++ b/.github/workflows/template_initialization.yaml @@ -7,7 +7,7 @@ jobs: - name: Checking availability for module name ${{github.event.repository.name}} on NPM. id: id1 - uses: garronej/github_actions_toolkit@v1 + uses: garronej/github_actions_toolkit@v1.1 with: action_name: is_well_formed_and_available_module_name module_name: ${{github.event.repository.name}} @@ -32,7 +32,7 @@ jobs: - run: mv LICENSE.template LICENSE - name : String replace id: id2 - uses: garronej/github_actions_toolkit@v1 + uses: garronej/github_actions_toolkit@v1.1 with: action_name: string_replace input_string: ${{github.event.repository.name}} diff --git a/README.template.md b/README.template.md index 5812669..b4265a5 100644 --- a/README.template.md +++ b/README.template.md @@ -28,7 +28,7 @@ import { myFunction, myObject } from '#{REPO_NAME}#'; ``` -Specific import +Specific imports: ```typescript import { myFunction } from '#{REPO_NAME}#/myFunction';