-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15 from dc7devs/develop
develop
- Loading branch information
Showing
7 changed files
with
62 additions
and
255 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ env: | |
on: | ||
push: | ||
branches: | ||
- dev | ||
- develop | ||
jobs: | ||
call-sync-main: | ||
name: Call sync-main-branch.yml | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,46 +1,23 @@ | ||
name: 'Sync dev branch' | ||
name: 'Sync develop branch' | ||
|
||
on: | ||
workflow_call: | ||
workflow_dispatch: | ||
|
||
jobs: | ||
create-sync-pr: | ||
rebase-to-dev: | ||
name: Rebase to develop | ||
runs-on: ubuntu-latest | ||
name: Sync dev branch | ||
|
||
outputs: | ||
PULL_REQUEST_NUMBER: ${{ steps.pull.outputs.PULL_REQUEST_NUMBER }} | ||
|
||
steps: | ||
- name: Checkout | ||
- name: Checkout repository | ||
uses: actions/checkout@v4 | ||
|
||
- name: Set up Node | ||
uses: actions/setup-node@v4 | ||
with: | ||
node-version: 20.13.x | ||
|
||
- name: Opening pull request | ||
id: pull | ||
uses: tretuna/[email protected] | ||
with: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
FROM_BRANCH: "main" | ||
TO_BRANCH: "dev" | ||
PULL_REQUEST_TITLE: "chore(git): merge `main` into `dev`" | ||
CONTENT_COMPARISON: true | ||
|
||
add-automerge-label: | ||
runs-on: ubuntu-latest | ||
name: Add "automerge" label | ||
needs: create-sync-pr | ||
|
||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
- name: Add "automerge" label | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
PULL_REQUEST_NUMBER: ${{needs.create-sync-pr.outputs.PULL_REQUEST_NUMBER}} | ||
run: gh pr edit $PULL_REQUEST_NUMBER --add-label automerge | ||
ref: 'develop' | ||
- name: Setup git | ||
run: | | ||
git config user.name "github-actions[bot]" | ||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com" | ||
- name: Fetch Main | ||
run: git fetch origin main:main | ||
- name: Rebase to develop | ||
run: git rebase main && git push |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
name: 'Sync main branch' | ||
|
||
on: | ||
workflow_call: | ||
workflow_dispatch: | ||
|
||
jobs: | ||
create-sync-pr: | ||
runs-on: ubuntu-latest | ||
name: Sync main branch | ||
|
||
outputs: | ||
PULL_REQUEST_NUMBER: ${{ steps.pull.outputs.PULL_REQUEST_NUMBER }} | ||
|
||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
|
||
- name: Set up Node | ||
uses: actions/setup-node@v4 | ||
with: | ||
node-version: 20.13.x | ||
|
||
- name: Opening pull request | ||
id: pull | ||
uses: tretuna/[email protected] | ||
with: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
FROM_BRANCH: "develop" | ||
TO_BRANCH: "main" | ||
PULL_REQUEST_TITLE: "chore(git): merge `develop` into `main`" | ||
CONTENT_COMPARISON: true | ||
|
||
add-automerge-label: | ||
runs-on: ubuntu-latest | ||
name: Add "automerge" label | ||
needs: create-sync-pr | ||
|
||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
- name: Add "automerge" label | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
PULL_REQUEST_NUMBER: ${{needs.create-sync-pr.outputs.PULL_REQUEST_NUMBER}} | ||
run: gh pr edit $PULL_REQUEST_NUMBER --add-label automerge |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters