From a2638420e8baf2540bd7f2aef1892951ec27f785 Mon Sep 17 00:00:00 2001 From: Max P Date: Fri, 16 Aug 2024 18:10:05 +0200 Subject: [PATCH] Create temp branch to handle release changes Introduced a temporary branch for release preparation steps before merging into the release branch. This isolates changes such as file removals and modifications until all updates are ready, improving workflow clarity and reducing risk of conflicts. After merging, the temp branch is deleted to keep the repository clean. --- .github/workflows/CreateRelease.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml index bee0f25..3877ca0 100644 --- a/.github/workflows/CreateRelease.yml +++ b/.github/workflows/CreateRelease.yml @@ -94,20 +94,29 @@ jobs: id: create_temp_branch if: steps.check_version.outputs.skip_release == 'false' run: | + # Create a temporary branch to commit the changes + git checkout -b temp-release-branch + # Remove unwanted files rm -rf .gitignore package-lock.json - # Checkout the release branch - git checkout release - # Add new/modified files git add README.md package.json LICENSE dist/ src/ tsconfig.json # Commit the changes git commit -m "Prepare files for release ${{ env.VERSION }}" + # Checkout the release branch + git checkout release + + # Merge the changes from the temporary branch into the release branch + git merge --no-ff temp-release-branch + # Push the changes to the release branch git push origin release + + # Delete the temporary branch + git branch -d temp-release-branch env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash