Enhance release branch update process

Refined workflow to ensure smoother updates to the release branch. Added steps to stash and apply local changes to prevent conflicts. Provided specific commands to checkout and update the release branch correctly. This approach maintains the branch's integrity and ensures all modifications are properly committed and pushed.
This commit is contained in:
2024-08-16 17:54:31 +02:00
parent 6581ef6058
commit 9caf12c61d

View File

@@ -94,11 +94,22 @@ jobs:
id: create_temp_branch id: create_temp_branch
if: steps.check_version.outputs.skip_release == 'false' if: steps.check_version.outputs.skip_release == 'false'
run: | run: |
git checkout release --no-checkout # Stash current changes (optional, only if you have unstaged changes you want to keep)
git reset git stash
rm -f .gitignore
# Checkout the release branch
git checkout release
# Apply stashed changes (if you stashed earlier)
git stash pop || true
# Add new/modified files
git add README.md package.json LICENSE dist/ src/ tsconfig.json git add README.md package.json LICENSE dist/ src/ tsconfig.json
# Commit the changes
git commit -m "Prepare files for release ${{ env.VERSION }}" git commit -m "Prepare files for release ${{ env.VERSION }}"
# Push the changes to the release branch
git push origin release git push origin release
shell: bash shell: bash