From 8f36e0bb895ecca7c89fee68fdc8987a0e98f50e Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Thu, 5 Sep 2024 11:23:22 +0200 Subject: [PATCH] refactor: another try --- .../update-release-candidate-branch.yml | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/update-release-candidate-branch.yml b/.github/workflows/update-release-candidate-branch.yml index 8245b4a..8fe8951 100644 --- a/.github/workflows/update-release-candidate-branch.yml +++ b/.github/workflows/update-release-candidate-branch.yml @@ -1,4 +1,4 @@ -name: Sync release-candidate Branch with Main +name: Update release-candidate Branch on: push: @@ -6,23 +6,18 @@ on: - main jobs: - sync-release-candidate: + update-release-candidate-branch: runs-on: ubuntu-latest - steps: - - name: Checkout Main Branch - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v3 with: - ref: main + fetch-depth: 0 - - name: Checkout release-candidate Branch + - name: Update release-candidate branch run: | - git fetch origin release-candidate + git config user.name github-actions + git config user.email github-actions@github.com git checkout release-candidate - - - name: Merge Main into release-candidate - run: | - git merge main + git merge origin/main git push origin release-candidate - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}