Skip to content

Commit

Permalink
Merge pull request #60 from vincejv/fix/sync-main-dev
Browse files Browse the repository at this point in the history
fix(github-actions): add branch resync during push in main
  • Loading branch information
vincejv authored Oct 21, 2022
2 parents 8893477 + 62fc3d7 commit f538945
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion .github/workflows/release-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,19 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}

rebase_dev:
name: Sync development branch
runs-on: ubuntu-latest
needs: versioning
steps:
- uses: actions/checkout@v3
- name: ReSync Branch
uses: Joao208/resync-branch@1.5.1
with:
PERSONAL_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH_NAME: development
DEFAULT_BRANCH: ${{github.event.repository.default_branch}}

code_quality_checks:
name: Code quality checks
runs-on: ubuntu-latest
Expand Down Expand Up @@ -96,7 +109,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
with:
ref: main
ref: ${{ github.event.repository.default_branch }}
fetch-depth: 0

- name: Set up JDK 17
Expand Down

0 comments on commit f538945

Please sign in to comment.