diff --git a/.github/workflows/codegen-models.yml b/.github/workflows/codegen-models.yml index 72f21434c..b8c27c467 100644 --- a/.github/workflows/codegen-models.yml +++ b/.github/workflows/codegen-models.yml @@ -5,14 +5,14 @@ on: paths: - 'packages/utils/cli-registry.yaml' branches: - [main] + - main + - 'feature/**' pull_request: paths: - 'packages/utils/cli-registry.yaml' jobs: codegen: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 6adfe0825..188accab9 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -35,7 +35,6 @@ env: jobs: e2e-test: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: E2E Integration Test runs-on: ${{ matrix.os }} strategy: diff --git a/.github/workflows/fleet-e2e.yml b/.github/workflows/fleet-e2e.yml index f2dfe93c5..21e7221a3 100644 --- a/.github/workflows/fleet-e2e.yml +++ b/.github/workflows/fleet-e2e.yml @@ -9,12 +9,13 @@ name: Fleet E2E # engine build), which rust-cache amortises on warm runs. The 20-minute job # timeout is a cold-build ceiling, not the matrix runtime. -# NOTE on branches: CI runs only on this repository's `trunk` -> `main` PR and -# on pushes to `main` (see the job `if:`). Feature branches, including -# `feat/fleet-*`, merge into `trunk` without CI. +# NOTE on branches: the fleet stack is developed on `feat/fleet-*` branches that +# merge into each other before `main`, so the trigger must include them — gating +# on `[main]` alone leaves this job inert for the entire feature stack (it would +# only run after something reaches main). Update to `[main]` once the stack lands. on: push: - branches: [main] + branches: [main, 'feat/fleet-**'] paths: - 'packages/fleet/**' - 'packages/cli/**' @@ -53,7 +54,6 @@ env: jobs: fleet-e2e: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Two-node fleet matrix runs-on: ubuntu-latest timeout-minutes: 20 diff --git a/.github/workflows/large-files.yml b/.github/workflows/large-files.yml index 306839141..ee6e2afb0 100644 --- a/.github/workflows/large-files.yml +++ b/.github/workflows/large-files.yml @@ -2,7 +2,6 @@ name: Large File Check on: [pull_request] jobs: check: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/node-compat.yml b/.github/workflows/node-compat.yml index cf365c1f2..4bc54e16c 100644 --- a/.github/workflows/node-compat.yml +++ b/.github/workflows/node-compat.yml @@ -18,14 +18,11 @@ concurrency: jobs: changes: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') uses: ./.github/workflows/detect-changes.yml install-test: name: Install Test (Node ${{ matrix.node-version }}) needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ubuntu-latest strategy: matrix: @@ -86,9 +83,7 @@ jobs: fresh-install: name: Fresh Install (Node ${{ matrix.node-version }}) needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/package-validation.yml b/.github/workflows/package-validation.yml index 48f241485..71fb73175 100644 --- a/.github/workflows/package-validation.yml +++ b/.github/workflows/package-validation.yml @@ -21,14 +21,11 @@ env: jobs: changes: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') uses: ./.github/workflows/detect-changes.yml validate: name: Build & Validate needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ubuntu-latest env: NPM_CONFIG_FUND: false @@ -202,9 +199,7 @@ jobs: publish-fresh-install-build: name: Publish Fresh Install Build needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ubuntu-latest env: NPM_CONFIG_FUND: false @@ -253,8 +248,9 @@ jobs: # provisioning an undeletable workspace; other same-repository PRs and # main pushes must reuse the CI workspace. if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true' && github.actor != 'dependabot[bot]' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)) + needs.changes.outputs.node_changed == 'true' && + github.actor != 'dependabot[bot]' && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) runs-on: macos-latest env: NPM_CONFIG_FUND: false diff --git a/.github/workflows/prettier-fmt-fix.yml b/.github/workflows/prettier-fmt-fix.yml index baa274e8e..4f85827b3 100644 --- a/.github/workflows/prettier-fmt-fix.yml +++ b/.github/workflows/prettier-fmt-fix.yml @@ -38,9 +38,7 @@ jobs: name: Auto-format Prettier files runs-on: ubuntu-latest # Only run on same-repo PRs where the bot can push back formatting commits. - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) + if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository permissions: contents: write steps: diff --git a/.github/workflows/relay-evals.yml b/.github/workflows/relay-evals.yml index c646a2d13..dc3ea0f59 100644 --- a/.github/workflows/relay-evals.yml +++ b/.github/workflows/relay-evals.yml @@ -38,7 +38,6 @@ env: jobs: evals: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Offline evals runs-on: ubuntu-latest diff --git a/.github/workflows/relayflow-pr-proof-broker.yml b/.github/workflows/relayflow-pr-proof-broker.yml index 3b3000b6e..6c152d9ba 100644 --- a/.github/workflows/relayflow-pr-proof-broker.yml +++ b/.github/workflows/relayflow-pr-proof-broker.yml @@ -31,8 +31,8 @@ jobs: build: name: ${{ github.event_name == 'pull_request' && 'Validate PR-head Linux broker' || 'Build exact Linux broker' }} if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (github.event_name != 'pull_request_target' || github.event.pull_request.head.repo.full_name == github.repository) + github.event_name != 'pull_request_target' || + github.event.pull_request.head.repo.full_name == github.repository runs-on: ubuntu-latest timeout-minutes: 30 steps: diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml index 21eb358cf..bf8833d3e 100644 --- a/.github/workflows/rust-ci.yml +++ b/.github/workflows/rust-ci.yml @@ -17,15 +17,12 @@ env: jobs: changes: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') uses: ./.github/workflows/detect-changes.yml rust-test: name: Rust Tests (${{ matrix.os }}) needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.rust_changed == 'true') + if: needs.changes.outputs.rust_changed == 'true' runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -45,9 +42,7 @@ jobs: relay-pty-windows-test: name: Relay PTY Synchronization Tests (windows-latest) needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.rust_changed == 'true') + if: needs.changes.outputs.rust_changed == 'true' runs-on: windows-latest timeout-minutes: 10 steps: @@ -67,9 +62,7 @@ jobs: rust-cross-compile: name: Cross-compile check (${{ matrix.target }}) needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.rust_changed == 'true') + if: needs.changes.outputs.rust_changed == 'true' runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -103,9 +96,7 @@ jobs: rust-clippy: name: Clippy (${{ matrix.os }}) needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.rust_changed == 'true') + if: needs.changes.outputs.rust_changed == 'true' runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -124,9 +115,7 @@ jobs: rust-fmt: name: Format needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.rust_changed == 'true') + if: needs.changes.outputs.rust_changed == 'true' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -138,9 +127,7 @@ jobs: sdk-check: name: SDK TypeScript Check needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/rust-fmt-fix.yml b/.github/workflows/rust-fmt-fix.yml index 1df1a6ab7..70472298f 100644 --- a/.github/workflows/rust-fmt-fix.yml +++ b/.github/workflows/rust-fmt-fix.yml @@ -20,9 +20,7 @@ jobs: name: Auto-format Rust code runs-on: ubuntu-latest # Only run on same-repo PRs where the bot can push back formatting commits. - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) + if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository permissions: contents: write steps: diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index 89d55e1c7..13e4df279 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -21,16 +21,13 @@ concurrency: jobs: changes: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') uses: ./.github/workflows/detect-changes.yml # NPM audit for known vulnerabilities npm-audit: name: NPM Audit needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ubuntu-latest steps: @@ -60,9 +57,7 @@ jobs: dependency-review: name: Dependency Review runs-on: ubuntu-latest - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (github.event_name == 'pull_request') + if: github.event_name == 'pull_request' # This job requires the dependency graph to be enabled in repo settings # Make it non-blocking until that's configured continue-on-error: true @@ -82,9 +77,7 @@ jobs: codeql: name: CodeQL Analysis needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ubuntu-latest permissions: security-events: write @@ -111,7 +104,6 @@ jobs: # Secret scanning (check for accidentally committed secrets) secrets-scan: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Secret Scanning runs-on: ubuntu-latest # Make non-blocking - review findings manually @@ -143,9 +135,7 @@ jobs: license-check: name: License Compliance needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ubuntu-latest steps: diff --git a/.github/workflows/stress-tests.yml b/.github/workflows/stress-tests.yml index ccaaa351d..323dbbf0a 100644 --- a/.github/workflows/stress-tests.yml +++ b/.github/workflows/stress-tests.yml @@ -29,7 +29,6 @@ concurrency: jobs: stress-test-orchestrator: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Orchestrator Stress Tests runs-on: ${{ matrix.os }} strategy: @@ -79,7 +78,6 @@ jobs: fi stress-test-orchestrator-integration: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Orchestrator Integration Stress Tests runs-on: ${{ matrix.os }} strategy: @@ -163,9 +161,7 @@ jobs: name: Stress Test Summary needs: [stress-test-orchestrator, stress-test-orchestrator-integration] runs-on: ubuntu-latest - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (always()) + if: always() steps: - name: Download all artifacts diff --git a/.github/workflows/targeted-feature-verification.yml b/.github/workflows/targeted-feature-verification.yml index 429a8d848..3e9fc7f72 100644 --- a/.github/workflows/targeted-feature-verification.yml +++ b/.github/workflows/targeted-feature-verification.yml @@ -35,7 +35,6 @@ concurrency: jobs: select: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Select Flows v2 shards runs-on: ubuntu-24.04 timeout-minutes: 15 @@ -94,7 +93,6 @@ jobs: retention-days: 14 targeted: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Flows v2 shard ${{ matrix.shard }} needs: select runs-on: ubuntu-24.04 diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 4a15760e0..abc1a1918 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -2,7 +2,6 @@ name: Test Build Scripts on: push: - branches: [main] paths: - 'scripts/build-bun.sh' - 'scripts/sign-macos-binary.sh' @@ -21,7 +20,6 @@ env: jobs: test-build-script: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test build-bun.sh runs-on: ${{ matrix.os }} strategy: @@ -109,7 +107,6 @@ jobs: done test-build-edge-cases: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test edge cases runs-on: ubuntu-latest @@ -157,9 +154,7 @@ jobs: name: Summary needs: [test-build-script, test-build-edge-cases] runs-on: ubuntu-latest - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (always()) + if: always() steps: - name: Summary diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index 47ab6edb4..0e5a2b065 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -2,7 +2,6 @@ name: Test Install Script on: push: - branches: [main] paths: - 'install.sh' - 'install.test.sh' @@ -26,7 +25,6 @@ env: jobs: test-install: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test on ${{ matrix.os }} (${{ matrix.node }}) runs-on: ${{ matrix.os }} strategy: @@ -183,7 +181,6 @@ jobs: # Test fallback when gunzip is not available test-no-gunzip: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test without gunzip runs-on: ubuntu-latest @@ -228,7 +225,6 @@ jobs: ' test-install-alpine: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test on Alpine Linux runs-on: ubuntu-latest @@ -268,7 +264,6 @@ jobs: ' test-install-fedora: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test on Fedora runs-on: ubuntu-latest @@ -304,7 +299,6 @@ jobs: # Test script syntax and edge cases test-script-quality: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Script Quality Checks runs-on: ubuntu-latest @@ -351,9 +345,7 @@ jobs: name: Test Summary needs: [test-install, test-install-alpine, test-install-fedora, test-no-gunzip, test-script-quality] runs-on: ubuntu-latest - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (always()) + if: always() steps: - name: Summary diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 785c27a46..88db5acb9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,14 +21,11 @@ env: jobs: changes: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') uses: ./.github/workflows/detect-changes.yml test: needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ${{ matrix.os }} strategy: matrix: @@ -64,9 +61,7 @@ jobs: windows-credential-acl: name: Windows credential ACL validation needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: windows-latest steps: - name: Checkout repository @@ -97,9 +92,7 @@ jobs: coverage: name: Coverage (upload) needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ubuntu-latest steps: - name: Checkout repository @@ -127,9 +120,7 @@ jobs: lint: needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.node_changed == 'true') + if: needs.changes.outputs.node_changed == 'true' runs-on: ubuntu-latest steps: - name: Checkout repository @@ -156,9 +147,7 @@ jobs: swift-test: name: Swift SDK Tests needs: changes - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && - (needs.changes.outputs.sdk_swift_changed == 'true') + if: needs.changes.outputs.sdk_swift_changed == 'true' runs-on: macos-latest defaults: run: diff --git a/.github/workflows/trunk-guard.yml b/.github/workflows/trunk-guard.yml deleted file mode 100644 index fbe379e4b..000000000 --- a/.github/workflows/trunk-guard.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Trunk guard - -# Only this repository's `trunk` branch may merge into main. Feature branches -# merge into `trunk`; CI runs only on the trunk -> main PR. -# pull_request_target loads this workflow from the base branch, so a PR cannot -# edit the guard to pass itself. It never checks out PR code. -on: - pull_request_target: - branches: [main] - types: [opened, synchronize, reopened, edited] - -permissions: {} - -jobs: - only-trunk-merges-to-main: - if: github.head_ref != 'trunk' || github.event.pull_request.head.repo.full_name != github.repository - runs-on: ubuntu-latest - timeout-minutes: 1 - steps: - - run: | - echo "::error::Only this repository's 'trunk' branch may merge into main. Retarget this PR to 'trunk'." - exit 1 diff --git a/AGENTS.md b/AGENTS.md index b9bbd8cac..9459ebd04 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -315,6 +315,7 @@ Future agents can query past trajectories to learn from your decisions. + ## Merging: `trunk` + the `mergeable` label CI suites do **not** run automatically on feature branches. They run only on @@ -326,21 +327,24 @@ run on any branch. (Repos whose default branch is not agent batches ready PRs into `trunk`, gets that one PR green, and merges it. **When you open a PR** + 1. Branch from `trunk` and open the PR with **base `trunk`**, not `main`. A PR into `main` from any other branch fails the `Trunk guard` check. 2. No CI runs on your PR, so verify locally before calling it ready: run the typecheck, tests and lint this repo uses, and list the exact commands and results in the PR body. -**When the PR is ready** -3. Add the label **`mergeable`** once all of these are true: - - The change is complete and the local checks above pass. - - Review feedback (human and bot) is addressed or answered. - - It is not a draft and does not depend on an unmerged PR. +**When the PR is ready** 3. Add the label **`mergeable`** once all of these are true: + +- The change is complete and the local checks above pass. +- Review feedback (human and bot) is addressed or answered. +- It is not a draft and does not depend on an unmerged PR. + 4. Remove `mergeable` if the PR stops being ready (new work, a failing check, a blocking question). The label is read live from GitHub on every sweep. **What you must not do** + - Do not merge your own PR, and never merge into or push to `trunk` or `main` directly. - Do not re-enable CI for feature branches or edit the `trunk` gates in @@ -355,4 +359,5 @@ to rebase on `trunk`; do so and keep the label. > Interim: the sweep worker is not deployed yet. Until it is, a human or a > designated agent performs the merge-agent steps manually. Labelling is unchanged. +