Fix autoformatting push to main in GitHub workflow
The push-to-main job was not correctly fetching the latest commit
(with formatting fixes) from the queue-main branch before pushing to main.
This ensures the latest changes are used.
Co-Authored-By: sketch <hello@sketch.dev>
diff --git a/.github/workflows/queue-main.yml b/.github/workflows/queue-main.yml
index 3dd6713..9f66b42 100644
--- a/.github/workflows/queue-main.yml
+++ b/.github/workflows/queue-main.yml
@@ -35,7 +35,7 @@
push-to-main:
runs-on: ubuntu-latest
- needs: [go-test, ui-test]
+ needs: [go-test, ui-test, formatting]
permissions:
contents: write
steps:
@@ -47,6 +47,14 @@
run: |
git config --global user.name "GitHub Actions Bot"
git config --global user.email "actions@github.com"
+
+ # Check if we have a formatting commit SHA
+ if [[ "${{ needs.formatting.outputs.commit_sha }}" != "" ]]; then
+ echo "Using formatted commit: ${{ needs.formatting.outputs.commit_sha }}"
+ git fetch origin ${{ needs.formatting.outputs.commit_sha }}
+ git checkout ${{ needs.formatting.outputs.commit_sha }}
+ fi
+
git push https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/boldsoftware/sketch.git HEAD:main
env:
GITHUB_TOKEN: ${{ github.token }}