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
79 changes: 58 additions & 21 deletions .github/workflows/build-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,43 @@ on:
type: boolean
required: false
default: false
secrets:
GPU_PRIORITY_VAL:
required: false
MACOS_KEYCHAIN_PASSWORD:
required: false
MACOS_NOTARIZATION_PASSWORD:
required: false
MACOS_NOTARIZATION_USERNAME:
required: false
MACOS_SIGNING_CERT:
required: false
MACOS_SIGNING_CERT_PASSWORD:
required: false
MACOS_SIGNING_IDENTITY:
required: false
MACOS_SIGNING_PROVISIONING_PROFILE:
required: false
RESTREAM_CLIENTID:
required: false
RESTREAM_HASH:
required: false
SOLDR_S3_CACHE_ACCESS_KEY:
required: false
SOLDR_S3_CACHE_SECRET_KEY:
required: false
TWITCH_CLIENT_ID:
required: false
TWITCH_HASH:
required: false
YOUTUBE_CLIENTID:
required: false
YOUTUBE_CLIENTID_HASH:
required: false
YOUTUBE_SECRET:
required: false
YOUTUBE_SECRET_HASH:
required: false
outputs:
skip_checks:
description: Immutable-base client admission skip_checks
Expand Down Expand Up @@ -1719,7 +1756,7 @@ jobs:
# letting it hold the queue for an hour (#2593 A).
timeout-minutes: 20
name: Fast Gate ⚡
runs-on: ubuntu-26.04
runs-on: ${{ github.event_name == 'pull_request' && inputs.mq-heavy-labels != '' && fromJSON(inputs.mq-heavy-labels) || 'ubuntu-26.04' }}
needs: [check-event, ci-mode]
# A docs-only PR or queue run changes no Rust, C or CMake: skipped, and
# passing CI Gate; the Format job still runs the ci/ self-tests (#2079).
Expand Down Expand Up @@ -1788,8 +1825,8 @@ jobs:
s3-region: nyc3
s3-cache-limit: 50G
env:
SOLDR_S3_CACHE_ACCESS_KEY: ${{ secrets.SOLDR_S3_CACHE_ACCESS_KEY }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ secrets.SOLDR_S3_CACHE_SECRET_KEY }}
SOLDR_S3_CACHE_ACCESS_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_ACCESS_KEY || '' }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_SECRET_KEY || '' }}

# GATE-001 mirror (local-gate.toml): exactly the local gate's lint and
# rust-test lanes (./lint, ./unittest), i.e. rustfmt, clippy -D warnings,
Expand Down Expand Up @@ -1987,8 +2024,8 @@ jobs:
if: ${{ !cancelled() && github.ref == 'refs/heads/master' }}
shell: bash
env:
AWS_ACCESS_KEY_ID: ${{ secrets.SOLDR_S3_CACHE_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SOLDR_S3_CACHE_SECRET_KEY }}
AWS_ACCESS_KEY_ID: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_ACCESS_KEY || '' }}
AWS_SECRET_ACCESS_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_SECRET_KEY || '' }}
AWS_DEFAULT_REGION: nyc3
run: |
if ! command -v aws >/dev/null; then
Expand Down Expand Up @@ -2025,7 +2062,7 @@ jobs:
cross-compile:
timeout-minutes: 45
name: Cross Compile 🧰 (${{ needs.check-event.outputs.cross_targets }})
runs-on: ubuntu-26.04
runs-on: ${{ github.event_name == 'pull_request' && inputs.mq-heavy-labels != '' && fromJSON(inputs.mq-heavy-labels) || 'ubuntu-26.04' }}
needs: [check-event, ci-mode]
if: ${{ (github.event_name != 'pull_request' || needs.ci-mode.outputs.fast_path != 'true') && !inputs.flatpak-measurement-only && needs.check-event.outputs.cross_targets != '' }}
defaults:
Expand Down Expand Up @@ -2058,8 +2095,8 @@ jobs:
s3-region: nyc3
s3-cache-limit: 50G
env:
SOLDR_S3_CACHE_ACCESS_KEY: ${{ secrets.SOLDR_S3_CACHE_ACCESS_KEY }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ secrets.SOLDR_S3_CACHE_SECRET_KEY }}
SOLDR_S3_CACHE_ACCESS_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_ACCESS_KEY || '' }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_SECRET_KEY || '' }}

# The mirror step runs before every package install, and it is Python
# now: soldr does not install uv, so without this the step fails with
Expand Down Expand Up @@ -2142,8 +2179,8 @@ jobs:
s3-region: nyc3
s3-cache-limit: 50G
env:
SOLDR_S3_CACHE_ACCESS_KEY: ${{ secrets.SOLDR_S3_CACHE_ACCESS_KEY }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ secrets.SOLDR_S3_CACHE_SECRET_KEY }}
SOLDR_S3_CACHE_ACCESS_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_ACCESS_KEY || '' }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_SECRET_KEY || '' }}

- name: Set Up uv 🐍
uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
Expand Down Expand Up @@ -2215,8 +2252,8 @@ jobs:
s3-region: nyc3
s3-cache-limit: 50G
env:
SOLDR_S3_CACHE_ACCESS_KEY: ${{ secrets.SOLDR_S3_CACHE_ACCESS_KEY }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ secrets.SOLDR_S3_CACHE_SECRET_KEY }}
SOLDR_S3_CACHE_ACCESS_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_ACCESS_KEY || '' }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_SECRET_KEY || '' }}

- name: Set Up uv 🐍
uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
Expand Down Expand Up @@ -2270,8 +2307,8 @@ jobs:
s3-region: nyc3
s3-cache-limit: 50G
env:
SOLDR_S3_CACHE_ACCESS_KEY: ${{ secrets.SOLDR_S3_CACHE_ACCESS_KEY }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ secrets.SOLDR_S3_CACHE_SECRET_KEY }}
SOLDR_S3_CACHE_ACCESS_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_ACCESS_KEY || '' }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_SECRET_KEY || '' }}

- name: Set Up uv 🐍
uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
Expand Down Expand Up @@ -2328,8 +2365,8 @@ jobs:
s3-region: nyc3
s3-cache-limit: 50G
env:
SOLDR_S3_CACHE_ACCESS_KEY: ${{ secrets.SOLDR_S3_CACHE_ACCESS_KEY }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ secrets.SOLDR_S3_CACHE_SECRET_KEY }}
SOLDR_S3_CACHE_ACCESS_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_ACCESS_KEY || '' }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_SECRET_KEY || '' }}

- name: Set Up uv 🐍
uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
Expand Down Expand Up @@ -2392,8 +2429,8 @@ jobs:
s3-region: nyc3
s3-cache-limit: 50G
env:
SOLDR_S3_CACHE_ACCESS_KEY: ${{ secrets.SOLDR_S3_CACHE_ACCESS_KEY }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ secrets.SOLDR_S3_CACHE_SECRET_KEY }}
SOLDR_S3_CACHE_ACCESS_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_ACCESS_KEY || '' }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_SECRET_KEY || '' }}

- name: Prepare Darwin standard library
run: uv run --no-project ci/macos_test_artifact.py prepare-target
Expand Down Expand Up @@ -2937,8 +2974,8 @@ jobs:
s3-region: nyc3
s3-cache-limit: 50G
env:
SOLDR_S3_CACHE_ACCESS_KEY: ${{ secrets.SOLDR_S3_CACHE_ACCESS_KEY }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ secrets.SOLDR_S3_CACHE_SECRET_KEY }}
SOLDR_S3_CACHE_ACCESS_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_ACCESS_KEY || '' }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ (github.event_name != 'pull_request' || inputs.mq-heavy-labels == '') && secrets.SOLDR_S3_CACHE_SECRET_KEY || '' }}

# The libobs lib-module cache (#3264): PRs restore master's modules,
# only master pushes save (a PR-ref cache is unreachable by other PRs).
Expand Down Expand Up @@ -3251,7 +3288,7 @@ jobs:
# otherwise.
linux-qt-frontend:
name: Qt Frontend Linux 🐧
runs-on: ubuntu-26.04
runs-on: ${{ github.event_name == 'pull_request' && inputs.mq-heavy-labels != '' && fromJSON(inputs.mq-heavy-labels) || 'ubuntu-26.04' }}
# Independent runner: overlap frontend compilation/tests with Fast Gate.
# The reusable workflow still fails if either selected job fails; this
# can spend extra Qt runner time when Fast Gate fails (#1581).
Expand Down
40 changes: 32 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ jobs:
actions: write
contents: read

# PRs use hosted runners directly; a queue probe must not allocate on admission.
# Probe on hosted infrastructure, using only immutable BASE code for PR routing.
select-mq-runner:
name: Select Merge Queue Runner
permissions:
contents: read
actions: read
if: github.event_name != 'pull_request'
if: github.event_name != 'pull_request' || (vars.DELL_PR_ROUTING == 'on' && github.event.pull_request.head.repo.full_name == github.repository)
runs-on: ubuntu-latest
timeout-minutes: 2
outputs:
Expand All @@ -91,39 +91,44 @@ jobs:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
id: checkout
continue-on-error: true
if: github.event_name == 'merge_group' && vars.MQ_RUNNER_LABELS != ''
if: (github.event_name == 'merge_group' || github.event_name == 'pull_request') && vars.MQ_RUNNER_LABELS != ''
with:
ref: ${{ github.event.pull_request.base.sha || github.sha }}
sparse-checkout: ci
persist-credentials: false
- uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
id: uv
continue-on-error: true
if: github.event_name == 'merge_group' && vars.MQ_RUNNER_LABELS != ''
if: (github.event_name == 'merge_group' || github.event_name == 'pull_request') && vars.MQ_RUNNER_LABELS != ''
with:
save-cache: ${{ github.ref == 'refs/heads/master' }}
enable-cache: false
- name: Create Runner Probe App Token
id: mq-probe-app
uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
continue-on-error: true
if: github.event_name == 'merge_group' && vars.MQ_RUNNER_LABELS != '' && vars.MQ_PROBE_APP_ID != ''
if: (github.event_name == 'merge_group' || github.event_name == 'pull_request') && vars.MQ_RUNNER_LABELS != '' && vars.MQ_PROBE_APP_ID != ''
with:
app-id: ${{ vars.MQ_PROBE_APP_ID }}
private-key: ${{ secrets.MQ_PROBE_APP_PRIVATE_KEY }}
owner: ${{ github.repository_owner }}
- name: Check Runner Availability
id: select
continue-on-error: true
if: github.event_name == 'merge_group' && vars.MQ_RUNNER_LABELS != '' && steps.checkout.outcome == 'success' && steps.uv.outcome == 'success'
if: (github.event_name == 'merge_group' || github.event_name == 'pull_request') && vars.MQ_RUNNER_LABELS != '' && steps.checkout.outcome == 'success' && steps.uv.outcome == 'success'
env:
BASE: ${{ github.event.pull_request.base.sha || github.sha }}
DELL_PR_ROUTING: ${{ vars.DELL_PR_ROUTING || 'off' }}
MQ_PR_RESERVE: ${{ vars.MQ_PR_RESERVE }}
MQ_PR_DEMAND: ${{ vars.MQ_PR_DEMAND }}
MQ_RUNNER_LABELS: ${{ vars.MQ_RUNNER_LABELS }}
MQ_RUNNER_MODE: ${{ vars.MQ_RUNNER_MODE }}
MQ_RUNNER_MIN_IDLE: ${{ vars.MQ_RUNNER_MIN_IDLE }}
# Tier 2 build + OFF/ON tests + two cross-lint legs + release lint.
MQ_RUNNER_DEMAND: ${{ vars.MQ_RUNNER_DEMAND || '6' }}
MQ_RUNNER_STATUS_TOKEN: ${{ steps.mq-probe-app.outputs.token || secrets.MQ_RUNNER_STATUS_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
run: uv run --no-project ci/select_mq_runner.py
run: uv run --no-project ci/run_base_runner_selector.py
- name: Report Probe Setup Failure
if: ${{ !cancelled() && (steps.checkout.outcome == 'failure' || steps.uv.outcome == 'failure' || steps.select.outcome == 'failure') }}
run: echo '::warning::Merge-queue runner probe could not complete; using hosted runners.'
Expand Down Expand Up @@ -196,7 +201,26 @@ jobs:
native-cache-reuse-source: ${{ github.event_name == 'workflow_dispatch' && inputs.native-cache-reuse-source || '' }}
native-cache-transport-probe: ${{ github.event_name == 'workflow_dispatch' && inputs.native-cache-transport-probe }}
native-cache-probe: ${{ github.event_name == 'workflow_dispatch' && inputs.native-cache-probe }}
secrets: inherit
# Routed PR jobs receive only the read-only event GITHUB_TOKEN.
secrets:
GPU_PRIORITY_VAL: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.GPU_PRIORITY_VAL || '' }}
MACOS_KEYCHAIN_PASSWORD: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.MACOS_KEYCHAIN_PASSWORD || '' }}
MACOS_NOTARIZATION_PASSWORD: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.MACOS_NOTARIZATION_PASSWORD || '' }}
MACOS_NOTARIZATION_USERNAME: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.MACOS_NOTARIZATION_USERNAME || '' }}
MACOS_SIGNING_CERT: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.MACOS_SIGNING_CERT || '' }}
MACOS_SIGNING_CERT_PASSWORD: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.MACOS_SIGNING_CERT_PASSWORD || '' }}
MACOS_SIGNING_IDENTITY: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.MACOS_SIGNING_IDENTITY || '' }}
MACOS_SIGNING_PROVISIONING_PROFILE: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.MACOS_SIGNING_PROVISIONING_PROFILE || '' }}
RESTREAM_CLIENTID: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.RESTREAM_CLIENTID || '' }}
RESTREAM_HASH: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.RESTREAM_HASH || '' }}
SOLDR_S3_CACHE_ACCESS_KEY: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.SOLDR_S3_CACHE_ACCESS_KEY || '' }}
SOLDR_S3_CACHE_SECRET_KEY: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.SOLDR_S3_CACHE_SECRET_KEY || '' }}
TWITCH_CLIENT_ID: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.TWITCH_CLIENT_ID || '' }}
TWITCH_HASH: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.TWITCH_HASH || '' }}
YOUTUBE_CLIENTID: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.YOUTUBE_CLIENTID || '' }}
YOUTUBE_CLIENTID_HASH: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.YOUTUBE_CLIENTID_HASH || '' }}
YOUTUBE_SECRET: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.YOUTUBE_SECRET || '' }}
YOUTUBE_SECRET_HASH: ${{ (github.event_name != 'pull_request' || needs.select-mq-runner.outputs.heavy-labels == '') && secrets.YOUTUBE_SECRET_HASH || '' }}
permissions:
actions: read
contents: write
Expand Down
34 changes: 34 additions & 0 deletions ci/run_base_runner_selector.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env -S uv run --script
"""Launch runner selection from immutable BASE objects, without head imports.

The hosted workflow checks out BASE before invoking this launcher. Keep the
selector and membership verifier together in an isolated module directory.
"""

import os
from pathlib import Path
import re
import subprocess
import tempfile


def main() -> int:
base = os.environ["BASE"]
if re.fullmatch(r"[0-9a-f]{40}", base) is None:
raise ValueError("invalid immutable base SHA")
with tempfile.TemporaryDirectory(prefix="dell-selector-", dir=os.environ.get("RUNNER_TEMP")) as directory:
trusted = Path(directory)
for script in ("select_mq_runner.py", "pr_attestation.py"):
source = subprocess.run(
["git", "show", f"{base}:ci/{script}"],
capture_output=True, check=True,
).stdout
(trusted / script).write_bytes(source)
return subprocess.run(
["uv", "run", "--no-project", str(trusted / "select_mq_runner.py")],
check=False,
).returncode


if __name__ == "__main__":
raise SystemExit(main())
Loading
Loading