From 7b03909c55f640821ce12c52f9d044dbddd26ea2 Mon Sep 17 00:00:00 2001 From: superdooper86 Date: Thu, 7 May 2026 23:30:18 +0200 Subject: [PATCH] Add rebase before push in both workflows to handle concurrent commits --- .github/workflows/release-beta.yml | 1 + .github/workflows/release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml index ab03569..09f4c4b 100644 --- a/.github/workflows/release-beta.yml +++ b/.github/workflows/release-beta.yml @@ -75,4 +75,5 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add version-beta.json README.md git commit -m "Beta release ${{ github.ref_name }}" + git pull --rebase origin main git push origin HEAD:main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ae0115c..33a3d8d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -91,6 +91,7 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add version.json README.md git commit -m "Release ${{ github.ref_name }}" + git pull --rebase origin main git push origin HEAD:main - name: Update Homebrew tap