Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
flakehub-publish:
runs-on: ubuntu-latest
needs: [check, package-build]
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main'
permissions:
id-token: write
contents: read
Expand All @@ -65,7 +65,7 @@ jobs:
flakehub-verify:
runs-on: ubuntu-latest
needs: flakehub-publish
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main'
steps:
- uses: DeterminateSystems/determinate-nix-action@629b284231c2a82554b724e357e47fc6020833c8 # v3

Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/update-opencode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,32 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh pr merge "${{ steps.create-pr.outputs.pull-request-number }}" --auto --squash --delete-branch

# Auto-merges performed with GITHUB_TOKEN do not emit a push event. Wait
# for the required PR checks and auto-merge, then explicitly start the
# main-branch publish/verification pipeline.
- name: Dispatch post-merge checks
if: steps.check.outputs.update_needed == 'true' && steps.create-pr.outputs.pull-request-number
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_NUMBER: ${{ steps.create-pr.outputs.pull-request-number }}
run: |
for _ in $(seq 1 120); do
state="$(gh pr view "$PR_NUMBER" --json state --jq .state)"
case "$state" in
MERGED)
gh workflow run check.yml --ref main
exit 0
;;
CLOSED)
echo "Update PR closed without merge" >&2
exit 1
;;
esac
sleep 10
done
echo "Timed out waiting for update PR auto-merge" >&2
exit 1

- name: Summary
if: always()
run: |
Expand Down