From bce647f4274465254f63f57d2c2775ba76f6751b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:48:44 +0000 Subject: [PATCH] ci(release): prevent deleting commits (#3356) (#3360) This can happen if commits are added to the release branch while an RC is being created. (cherry picked from commit 2810f6c5dc25030466e3b1581d2f080ce19938a6) Co-authored-by: Ev --- .github/workflows/RELEASE.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/RELEASE.yaml b/.github/workflows/RELEASE.yaml index 630c1dc15f..e4e4ddca43 100644 --- a/.github/workflows/RELEASE.yaml +++ b/.github/workflows/RELEASE.yaml @@ -248,9 +248,9 @@ jobs: - name: Commit and tag run: | git commit -am "ci: release version ${RELEASE_VERSION}" - git push --force origin ${RELEASE_BRANCH} + git push --force-with-lease origin ${RELEASE_BRANCH} git tag -fa ${RELEASE_VERSION} -m "ci: release version ${RELEASE_VERSION}" - git push --force origin ${RELEASE_VERSION} + git push --force-with-lease origin ${RELEASE_VERSION} env: RELEASE_VERSION: ${{ github.event.release.tag_name }}