diff --git a/.github/workflows/release-rs.yml b/.github/workflows/release-rs.yml index 5f5e4af..cb10595 100644 --- a/.github/workflows/release-rs.yml +++ b/.github/workflows/release-rs.yml @@ -64,6 +64,7 @@ jobs: - name: Commit Changes run: | RC_BRANCH="rc/rs/v${{ steps.release_info.outputs.version }}" + R_TAG="rs/v${{ steps.release_info.outputs.version }}" #git config --global user.name "${{ steps.release_info.outputs.author_name }}" #git config --global user.email "${{ steps.release_info.outputs.author_email }}" git config --global user.name "github-actions[bot]" @@ -73,13 +74,14 @@ jobs: git add Cargo.lock git commit -m "build: update version to v${{ steps.release_info.outputs.version }}" git push origin "$RC_BRANCH" - git tag rs/v${{ steps.release_info.outputs.version }} - git push origin rs/v${{ steps.release_info.outputs.version }} + git tag "$R_TAG" + git push origin "$R_TAG" git push --delete origin "${GITHUB_REF#refs/tags/}" - git checkout main - git merge --squash "$RC_BRANCH" - git commit -m "chore: sync release v${{ steps.release_info.outputs.version }}" - git push origin main + #git checkout main + #git merge --squash "$RC_BRANCH" + #git commit -m "chore: sync release v${{ steps.release_info.outputs.version }}" + #git push origin main + git checkout "$R_TAG" git branch -d "$RC_BRANCH" git push origin --delete "$RC_BRANCH" env: