-
-
Notifications
You must be signed in to change notification settings - Fork 663
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create App_Header_Merge_Main_Into_update-app-headers
- Loading branch information
Showing
1 changed file
with
29 additions
and
0 deletions.
There are no files selected for viewing
29 changes: 29 additions & 0 deletions
29
.github/workflows/App_Header_Merge_Main_Into_update-app-headers
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,29 @@ | ||
name: App-Header: Merge main into update-app-headers | ||
|
||
on: | ||
push: | ||
branches: | ||
- main | ||
paths: | ||
- 'ct/**.sh' | ||
|
||
jobs: | ||
merge-main: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout repository | ||
uses: actions/checkout@v2 | ||
|
||
- name: Set up Git | ||
run: | | ||
git config --global user.name "GitHub Actions" | ||
git config --global user.email "[email protected]" | ||
|
||
- name: Merge main into update-app-headers silently | ||
run: | | ||
git fetch origin | ||
git checkout update-app-headers | ||
git merge origin/main --no-ff --no-commit -m "Merge main into update-app-headers" | ||
git push origin update-app-headers > /dev/null 2>&1 || true | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |