From ad3214acfbc0c2a2367c1e555d62ef71c51a8b34 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 10 Jan 2025 17:00:16 +0100 Subject: [PATCH] Create App_Header_Merge_Main_Into_update-app-headers --- ..._Header_Merge_Main_Into_update-app-headers | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/App_Header_Merge_Main_Into_update-app-headers diff --git a/.github/workflows/App_Header_Merge_Main_Into_update-app-headers b/.github/workflows/App_Header_Merge_Main_Into_update-app-headers new file mode 100644 index 0000000000..c4f72692ce --- /dev/null +++ b/.github/workflows/App_Header_Merge_Main_Into_update-app-headers @@ -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 "actions@github.com" + + - 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 }}