From 65cee9dc6cefa04e8acdfd5cd01c0e530c15199d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Dvo=C5=99=C3=A1k?= Date: Sat, 3 Aug 2024 23:09:46 +0200 Subject: [PATCH] Update merger.yml --- .github/workflows/merger.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/merger.yml b/.github/workflows/merger.yml index 4a7671a653f2..5bad99d147f1 100644 --- a/.github/workflows/merger.yml +++ b/.github/workflows/merger.yml @@ -3,7 +3,9 @@ name: Create tf/build/main Branch on: workflow_dispatch: push: - + branches: + - '**' # Spouští workflow při push událostech do všech větví + jobs: create-tf-build-main: runs-on: ubuntu-latest @@ -24,21 +26,22 @@ jobs: - name: Fetch all branches run: git fetch --all - - name: Create and update tf/build/main branch from upstream/main + - name: Checkout and create tf/build/main branch from upstream/main run: | - git checkout upstream/main - git checkout -b tf/build/main + git checkout -b tf/build/main upstream/main - name: Fetch and merge tf/SHT4x run: | git fetch origin tf/SHT4x:tf/SHT4x - git merge tf/SHT4x + git merge tf/SHT4x || git merge --abort - name: Fetch and merge tf/s35770 run: | git fetch origin tf/s35770:tf/s35770 - git merge tf/s35770 + git merge tf/s35770 || git merge --abort - name: Push tf/build/main branch to origin - run: | - git push origin tf/build/main --force + run: git push origin tf/build/main --force + + - name: Checkout back to main + run: git checkout main