From a72bf4c69a7634d5d2c158f43460d083f84d9de9 Mon Sep 17 00:00:00 2001 From: Raed Bahri Date: Sat, 24 May 2025 01:44:38 +0100 Subject: [PATCH 1/2] fix: update release workflow to push to current branch and support multiple default branches --- .github/workflows/release.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a2dada..4cf45bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,8 @@ on: push: branches: - master + - main + - dev release: types: [published] @@ -42,7 +44,7 @@ jobs: # Update release draft when changes are pushed to master update_release_draft: name: Update Release Draft - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') needs: build runs-on: ubuntu-latest permissions: @@ -97,9 +99,9 @@ jobs: # Run standard-version to update package.json and CHANGELOG.md npx standard-version --release-as $VERSION_WITHOUT_V --skip.tag - - # Push changes back to master - git push origin master + # Push changes back to the current branch + CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) + git push origin $CURRENT_BRANCH - name: Build project run: npm run build From d03f00a61fbe12e085b0aa885e987479e1fec96f Mon Sep 17 00:00:00 2001 From: Raed Bahri Date: Sat, 24 May 2025 01:45:29 +0100 Subject: [PATCH 2/2] fix: remove main branch --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4cf45bd..83ee5a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,6 @@ on: push: branches: - master - - main - dev release: types: [published] @@ -44,7 +43,7 @@ jobs: # Update release draft when changes are pushed to master update_release_draft: name: Update Release Draft - if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') + if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') needs: build runs-on: ubuntu-latest permissions: