From a431537fb8ac6b7ca1e04f4e05a469bea29dab1f Mon Sep 17 00:00:00 2001 From: Han Xiao Date: Sun, 3 Jan 2021 17:30:13 +0100 Subject: [PATCH] ci: fix github-push-action default branch --- .github/workflows/autocommit.yml | 3 ++- .github/workflows/cd.yml | 3 ++- .github/workflows/force-release.yml | 8 +++++++- .github/workflows/release.yml | 6 ++++++ .github/workflows/tag.yml | 4 ++-- scripts/release.sh | 1 - 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/autocommit.yml b/.github/workflows/autocommit.yml index fd99653a915ae..cfeab886d4b29 100644 --- a/.github/workflows/autocommit.yml +++ b/.github/workflows/autocommit.yml @@ -74,6 +74,7 @@ jobs: TOC_TITLE: '' TARGET_PATHS: 'CHANGELOG.md,CONTRIBUTING.md' CHECK_ONLY_DEFAULT_BRANCH: true - - uses: ad-m/github-push-action@master + - uses: ad-m/github-push-action@v0.6.0 with: github_token: ${{ secrets.JINA_DEV_BOT }} + branch: master diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 0d9e1a2c84c75..17f43a9655bcb 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -59,12 +59,13 @@ jobs: token: ${{ secrets.JINA_DEV_BOT }} - run: | ./scripts/make-doc.sh commit "update ${{env.JINA_VERSION}} due to ${{github.event_name}} on ${{github.repository}}" - - uses: ad-m/github-push-action@master + - uses: ad-m/github-push-action@v0.6.0 with: github_token: ${{ secrets.JINA_DEV_BOT }} repository: jina-ai/jina-docs directory: docs/_build/html force: true + branch: master update-docker: needs: update-doc diff --git a/.github/workflows/force-release.yml b/.github/workflows/force-release.yml index 448e8862c4f1f..1ddfe1d592e2c 100644 --- a/.github/workflows/force-release.yml +++ b/.github/workflows/force-release.yml @@ -29,4 +29,10 @@ jobs: TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} JINA_SLACK_WEBHOOK: ${{ secrets.JINA_SLACK_WEBHOOK }} - if: failure() - run: echo "nothing to release" \ No newline at end of file + run: echo "nothing to release" + - name: bumping master version + uses: ad-m/github-push-action@v0.6.0 + with: + github_token: ${{ secrets.JINA_DEV_BOT }} + tags: true + branch: master \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57dbda17b06af..256b26dec81f7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,3 +38,9 @@ jobs: JINA_SLACK_WEBHOOK: ${{ secrets.JINA_SLACK_WEBHOOK }} - if: failure() run: echo "nothing to release" + - name: bumping master version + uses: ad-m/github-push-action@v0.6.0 + with: + github_token: ${{ secrets.JINA_DEV_BOT }} + tags: true + branch: master diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index cae465104c162..26f82fee6245e 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -58,13 +58,14 @@ jobs: env: JINA_VERSION: ${{steps.get_version.outputs.JINA_VERSION}} V_JINA_VERSION: ${{steps.get_version.outputs.V_JINA_VERSION}} - - uses: ad-m/github-push-action@master + - uses: ad-m/github-push-action@v0.6.0 with: github_token: ${{ secrets.JINA_DEV_BOT }} repository: jina-ai/jina-docs force: true directory: docs/_build/html tags: true + branch: master update-docker: needs: update-doc @@ -106,7 +107,6 @@ jobs: tags: "latest, ${{env.JINA_VERSION}}, ${{env.JINA_MINOR_VERSION}}" create-release: - needs: update-docker runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/scripts/release.sh b/scripts/release.sh index b29ad59f696e9..587de86c8cdc6 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -48,7 +48,6 @@ function git_commit { echo -e "$RELEASE_VER" >> docs/versions git add $INIT_FILE ./CHANGELOG.md jina/hub docs/versions git commit -m "chore(version): the next version will be $NEXT_VER" - git push } function slack_notif {