diff --git a/.github/workflows/update-stable.yml b/.github/workflows/update-stable.yml index d6d00f6..d4d1fbe 100644 --- a/.github/workflows/update-stable.yml +++ b/.github/workflows/update-stable.yml @@ -15,7 +15,10 @@ jobs: pull-requests: read steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GITHUB_TOKEN }} - name: Configure Git run: | @@ -158,22 +161,23 @@ jobs: - name: Commit Version Update run: | - git add package.json pnpm-lock.yaml + git pull + git add package.json pnpm-lock.yaml changelog.md git commit -m "chore: bump version to ${{ steps.bump_version.outputs.new_version }}" - git push main + git push - name: Update Stable Branch run: | # Ensure stable branch exists git checkout stable 2>/dev/null || git checkout -b stable git merge main --no-ff -m "chore: merge main into stable for version ${{ steps.bump_version.outputs.new_version }}" - git push stable + git push --set-upstream origin stable - name: Create and Push Tag run: | VERSION="v${{ steps.bump_version.outputs.new_version }}" git tag -a "$VERSION" -m "Release $VERSION" - git push "$VERSION" + git push origin "$VERSION" # - name: Create GitHub Release # env: diff --git a/app/commit.json b/app/commit.json index 1450397..54cae12 100644 --- a/app/commit.json +++ b/app/commit.json @@ -1 +1 @@ -{ "commit": "cbad04f035f017a4797768c75e180f10920c0e17" } +{ "commit": "3f706702b2486e72efe1602e710ccef6c387c82a" }