|
| 1 | +name: squash-once |
| 2 | +on: |
| 3 | + push: |
| 4 | + paths: |
| 5 | + - .github/workflows/squash-once.yml |
| 6 | + workflow_dispatch: |
| 7 | +jobs: |
| 8 | + squash: |
| 9 | + runs-on: ubuntu-latest |
| 10 | + permissions: |
| 11 | + contents: write |
| 12 | + steps: |
| 13 | + - uses: actions/checkout@v4 |
| 14 | + with: |
| 15 | + ref: cursor/datetime-search-attr-tz-0487 |
| 16 | + fetch-depth: 0 |
| 17 | + token: ${{ secrets.GITHUB_TOKEN }} |
| 18 | + - name: Soft-squash to single clean commit |
| 19 | + env: |
| 20 | + GIT_AUTHOR_NAME: Kailash Nelson |
| 21 | + GIT_AUTHOR_EMAIL: 37966146+KingLizard1020@users.noreply.github.com |
| 22 | + GIT_COMMITTER_NAME: Kailash Nelson |
| 23 | + GIT_COMMITTER_EMAIL: 37966146+KingLizard1020@users.noreply.github.com |
| 24 | + run: | |
| 25 | + set -euo pipefail |
| 26 | + git config user.name "Kailash Nelson" |
| 27 | + git config user.email "37966146+KingLizard1020@users.noreply.github.com" |
| 28 | + git remote remove upstream 2>/dev/null || true |
| 29 | + git remote add upstream "https://github.com/temporalio/sdk-python.git" |
| 30 | + git fetch --no-tags upstream main |
| 31 | + MB=$(git merge-base HEAD "upstream/main") |
| 32 | + echo "merge-base=$MB" |
| 33 | + git reset --soft "$MB" |
| 34 | + rm -f ".github/workflows/squash-once.yml" || true |
| 35 | + rm -f ".github/workflows/apply-review-fix.yml" || true |
| 36 | + find . -maxdepth 3 -name '.cursor-*' -type f -delete 2>/dev/null || true |
| 37 | + git add -A |
| 38 | + git rm -f --ignore-unmatch .github/workflows/squash-once.yml .github/workflows/apply-review-fix.yml || true |
| 39 | + echo "UmFpc2UgVmFsdWVFcnJvciBmb3IgbmFpdmUgZGF0ZXRpbWUgc2VhcmNoIGF0dHJpYnV0ZXMKCk1pcnJvciB0aGUgdW50eXBlZCBlbmNvZGVyIHRpbWV6b25lIGNoZWNrIGludG8gdGhlIHR5cGVkIHBhdGggc28KdXBzZXJ0aW5nIG9yIGVuY29kaW5nIGEgZGF0ZXRpbWUgc2VhcmNoIGF0dHJpYnV0ZSB3aXRob3V0IHR6aW5mbwpmYWlscyBjbGllbnQtc2lkZSBpbnN0ZWFkIG9mIGFzIGEgc2VydmVyIEJhZFNlYXJjaEF0dHJpYnV0ZXMgZXJyb3IuCgpTaWduZWQtb2ZmLWJ5OiBLYWlsYXNoIE5lbHNvbiA8Mzc5NjYxNDYrS2luZ0xpemFyZDEwMjBAdXNlcnMubm9yZXBseS5naXRodWIuY29tPg==" | base64 -d > /tmp/commit_msg.txt |
| 40 | + if git diff --cached --quiet; then |
| 41 | + echo "ERROR: empty index after soft reset" >&2 |
| 42 | + exit 1 |
| 43 | + fi |
| 44 | + git commit -F /tmp/commit_msg.txt |
| 45 | + git log -1 --format=fuller |
| 46 | + git push --force origin "HEAD:cursor/datetime-search-attr-tz-0487" |
0 commit comments