diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a68e9df..e864ef5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,10 +2,10 @@ name: ci on: push: branches: - - develop + - main pull_request: branches: - - develop + - main jobs: @@ -71,8 +71,8 @@ jobs: branch: latest compare_to_version: '0.0.0' - - name: Get version on develop - id: v_develop + - name: Get version on main + id: v_main uses: garronej/github_actions_toolkit@v1.11 with: action_name: get_package_json_version @@ -82,7 +82,7 @@ jobs: compare_to_version: ${{steps.v_latest.outputs.version || '0.0.0'}} - name: 'Trigger the ''publish'' workflow' - if: ${{ !!env.PAT && steps.v_develop.outputs.compare_result == '1' }} + if: ${{ !!env.PAT && steps.v_main.outputs.compare_result == '1' }} uses: garronej/github_actions_toolkit@v1.11 env: GITHUB_TOKEN: ${{ secrets.PAT }} @@ -96,7 +96,7 @@ jobs: format( '{{"from_version":"{0}","to_version":"{1}","repo":"{2}"}}', steps.v_latest.outputs.version, - steps.v_develop.outputs.version, + steps.v_main.outputs.version, github.event.repository.name ) }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f973285..088eace 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -15,7 +15,7 @@ jobs: action_name: sync_package_and_package_lock_version owner: ${{github.repository_owner}} repo: ${{github.event.client_payload.repo}} - branch: develop + branch: main commit_author_email: ts_ci@github.com - name: Update CHANGELOG.md if: ${{ !!github.event.client_payload.from_version }} @@ -27,7 +27,7 @@ jobs: owner: ${{github.repository_owner}} repo: ${{github.event.client_payload.repo}} branch_behind: latest - branch_ahead: develop + branch_ahead: main commit_author_email: ts_ci@github.com exclude_commit_from_author_names_json: '["ts_ci"]' @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - ref: develop + ref: main - name: Remove .github directory, useless on 'latest' branch run: rm -r .github - name: Remove branch 'latest' diff --git a/.github/workflows/template_initialization.yaml b/.github/workflows/template_initialization.yaml index af884bc..8ec30de 100644 --- a/.github/workflows/template_initialization.yaml +++ b/.github/workflows/template_initialization.yaml @@ -2,7 +2,7 @@ name: template_initialization on: push: branches: - - develop + - main jobs: template_initialization: @@ -64,7 +64,7 @@ jobs: uses: ad-m/github-push-action@v0.5.0 with: github_token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }} - branch: develop + branch: main debug: runs-on: ubuntu-latest diff --git a/README.template.md b/README.template.md index a64d4ce..da90375 100644 --- a/README.template.md +++ b/README.template.md @@ -5,7 +5,7 @@ #{DESC}#

- +