diff --git a/.github/workflows/codegen-models.yml b/.github/workflows/codegen-models.yml index 72f21434cb..ee42b5798d 100644 --- a/.github/workflows/codegen-models.yml +++ b/.github/workflows/codegen-models.yml @@ -4,15 +4,14 @@ on: push: paths: - 'packages/utils/cli-registry.yaml' - branches: - [main] + branches: [main] 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 6adfe08250..6a457ddb99 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -35,7 +35,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: E2E Integration Test runs-on: ${{ matrix.os }} strategy: diff --git a/.github/workflows/fleet-e2e.yml b/.github/workflows/fleet-e2e.yml index f2dfe93c5f..a636fb510c 100644 --- a/.github/workflows/fleet-e2e.yml +++ b/.github/workflows/fleet-e2e.yml @@ -9,9 +9,9 @@ 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: this runs on pushes to `main` and on pull requests from this +# repository (see the job `if:`) into `main` or a `feat/fleet-**` stack base. +# Feature branches are tested through their PR, not through push runs. on: push: branches: [main] @@ -53,7 +53,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository 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 306839141b..816479c9bf 100644 --- a/.github/workflows/large-files.yml +++ b/.github/workflows/large-files.yml @@ -2,7 +2,7 @@ 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') + if: github.event.pull_request.head.repo.full_name == github.repository runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/node-compat.yml b/.github/workflows/node-compat.yml index cf365c1f21..6590800dcb 100644 --- a/.github/workflows/node-compat.yml +++ b/.github/workflows/node-compat.yml @@ -18,13 +18,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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest strategy: @@ -87,7 +87,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/package-validation.yml b/.github/workflows/package-validation.yml index 48f2414850..812137e754 100644 --- a/.github/workflows/package-validation.yml +++ b/.github/workflows/package-validation.yml @@ -21,13 +21,13 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest env: @@ -203,7 +203,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest env: @@ -252,9 +252,7 @@ jobs: # secrets. Skip this live-cloud smoke there instead of falling back to # 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)) + if: 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 baa274e8ec..4f85827b3c 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 c646a2d136..46ccb49868 100644 --- a/.github/workflows/relay-evals.yml +++ b/.github/workflows/relay-evals.yml @@ -38,7 +38,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository 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 3b3000b6e8..699477e947 100644 --- a/.github/workflows/relayflow-pr-proof-broker.yml +++ b/.github/workflows/relayflow-pr-proof-broker.yml @@ -30,9 +30,7 @@ env: 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) + if: (github.event_name != 'pull_request' && 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 21eb358cf3..ba1860ce3e 100644 --- a/.github/workflows/rust-ci.yml +++ b/.github/workflows/rust-ci.yml @@ -17,14 +17,14 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.rust_changed == 'true') runs-on: ${{ matrix.os }} strategy: @@ -46,7 +46,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.rust_changed == 'true') runs-on: windows-latest timeout-minutes: 10 @@ -68,7 +68,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.rust_changed == 'true') runs-on: ${{ matrix.os }} strategy: @@ -104,7 +104,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.rust_changed == 'true') runs-on: ${{ matrix.os }} strategy: @@ -125,7 +125,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.rust_changed == 'true') runs-on: ubuntu-latest steps: @@ -139,7 +139,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: diff --git a/.github/workflows/rust-fmt-fix.yml b/.github/workflows/rust-fmt-fix.yml index 1df1a6ab78..70472298f0 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 89d55e1c7c..d758d3663c 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -21,7 +21,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository uses: ./.github/workflows/detect-changes.yml # NPM audit for known vulnerabilities @@ -29,10 +29,9 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest - steps: - name: Checkout code uses: actions/checkout@v4 @@ -61,7 +60,7 @@ jobs: 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' || github.event.pull_request.head.repo.full_name == github.repository) && (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 @@ -83,7 +82,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest permissions: @@ -111,7 +110,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 @@ -144,10 +142,9 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest - steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/stress-tests.yml b/.github/workflows/stress-tests.yml index ccaaa351d1..08b1791d74 100644 --- a/.github/workflows/stress-tests.yml +++ b/.github/workflows/stress-tests.yml @@ -29,7 +29,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: Orchestrator Stress Tests runs-on: ${{ matrix.os }} strategy: @@ -79,7 +79,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: Orchestrator Integration Stress Tests runs-on: ${{ matrix.os }} strategy: @@ -164,7 +164,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (always()) steps: diff --git a/.github/workflows/targeted-feature-verification.yml b/.github/workflows/targeted-feature-verification.yml index 429a8d8489..8264f4fbfd 100644 --- a/.github/workflows/targeted-feature-verification.yml +++ b/.github/workflows/targeted-feature-verification.yml @@ -35,7 +35,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: Select Flows v2 shards runs-on: ubuntu-24.04 timeout-minutes: 15 @@ -94,7 +94,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository 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 4a15760e00..a267819bf9 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -21,7 +21,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: Test build-bun.sh runs-on: ${{ matrix.os }} strategy: @@ -109,7 +109,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: Test edge cases runs-on: ubuntu-latest @@ -158,7 +158,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (always()) steps: diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index 47ab6edb4a..4837a9b17d 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -26,7 +26,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: Test on ${{ matrix.os }} (${{ matrix.node }}) runs-on: ${{ matrix.os }} strategy: @@ -183,7 +183,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: Test without gunzip runs-on: ubuntu-latest @@ -228,7 +228,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: Test on Alpine Linux runs-on: ubuntu-latest @@ -268,7 +268,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: Test on Fedora runs-on: ubuntu-latest @@ -304,7 +304,7 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository name: Script Quality Checks runs-on: ubuntu-latest @@ -352,7 +352,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (always()) steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 785c27a46b..b1dfe2de74 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,13 +21,13 @@ 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') + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ${{ matrix.os }} strategy: @@ -65,7 +65,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: windows-latest steps: @@ -98,7 +98,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: @@ -128,7 +128,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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: @@ -157,7 +157,7 @@ jobs: 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')) && + (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (needs.changes.outputs.sdk_swift_changed == 'true') runs-on: macos-latest defaults: diff --git a/.github/workflows/trunk-guard.yml b/.github/workflows/trunk-guard.yml deleted file mode 100644 index fbe379e4bf..0000000000 --- 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 b9bbd8cac9..032295138b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -313,46 +313,3 @@ Your trajectory helps others understand: 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 -this repository's `trunk` → `main` pull request and on pushes to `main`. The -one check that does run on a feature PR into `main` is `Trunk guard`, which -fails it on purpose; manually dispatched workflows (`workflow_dispatch`) still -run on any branch. (Repos whose default branch is not -`main`, e.g. `master`, use that branch wherever this says `main`.) A merge -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. -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 - `.github/workflows/`. - -**The merge agent** sweeps open `mergeable` PRs with base `trunk` about every -10 minutes. It reads each PR's linked sessions (the `Agent Relay sessions` -block in the PR body, then the session summary) for context, merges them into -`trunk`, opens or updates the `trunk` → `main` PR, fixes CI there, merges when -green, and posts a summary. If your PR conflicts with `trunk`, it may ask you -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. - diff --git a/prpm.lock b/prpm.lock index 5f049c207d..5d02425a91 100644 --- a/prpm.lock +++ b/prpm.lock @@ -275,24 +275,7 @@ "sourceFormat": "claude", "sourceSubtype": "skill", "installedPath": ".agents/skills/writing-relayflows/SKILL.md" - }, - "@agent-relay/merge-train-snippet#agents.md:AGENTS.md": { - "version": "1.0.1", - "resolved": "https://registry.prpm.dev/api/v1/packages/%40agent-relay%2Fmerge-train-snippet/1.0.1.tar.gz", - "integrity": "sha256-b993f4fd7a737b5788f10fca8b02d6eea02c803b1d4483f6536f3cfd3f85126e", - "format": "agents.md", - "subtype": "snippet", - "sourceFormat": "generic", - "sourceSubtype": "snippet", - "installedPath": "AGENTS.md", - "snippetMetadata": { - "targetPath": "AGENTS.md", - "config": { - "target": "AGENTS.md", - "position": "append" - } - } } }, "generated": "2026-10-08T23:07:11.486Z" -} \ No newline at end of file +}