Skip to content

Commit

Permalink
ci: fix github-push-action default branch
Browse files Browse the repository at this point in the history
  • Loading branch information
hanxiao committed Jan 3, 2021
1 parent b2430fb commit a431537
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/autocommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/force-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,10 @@ jobs:
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
JINA_SLACK_WEBHOOK: ${{ secrets.JINA_SLACK_WEBHOOK }}
- if: failure()
run: echo "nothing to release"
run: echo "nothing to release"
- name: bumping master version
uses: ad-m/[email protected]
with:
github_token: ${{ secrets.JINA_DEV_BOT }}
tags: true
branch: master
6 changes: 6 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
github_token: ${{ secrets.JINA_DEV_BOT }}
tags: true
branch: master
4 changes: 2 additions & 2 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit a431537

Please sign in to comment.