Skip to content
Closed
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
6 changes: 5 additions & 1 deletion .github/actionlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,9 @@ self-hosted-runner:
labels:
- blacksmith-8vcpu-ubuntu-2404-arm
- blacksmith-8vcpu-windows-2025
- blacksmith-6vcpu-macos-26
- blacksmith-6vcpu-macos-27
# GitHub-hosted Xcode 27 image; newer than the pinned actionlint label list.
- xcode-27
- blacksmith-8vcpu-ubuntu-2404
- blacksmith-16vcpu-ubuntu-2404
- blacksmith-32vcpu-ubuntu-2404
14 changes: 12 additions & 2 deletions .github/workflows/agent-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [blacksmith-8vcpu-ubuntu-2404, macos-26, windows-latest]
os: [blacksmith-8vcpu-ubuntu-2404, xcode-27, windows-latest]
steps:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
with:
Expand All @@ -101,6 +101,11 @@ jobs:
working-directory: .
run: bash scripts/ci/verify-nix-runtime.sh

- name: Select pinned Xcode
if: runner.os == 'macOS'
working-directory: .
run: python3 scripts/ci/select-xcode.py

- name: Install pinned Windows Rust
if: runner.os == 'Windows'
uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable action, exact toolchain below
Expand Down Expand Up @@ -264,7 +269,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [blacksmith-8vcpu-ubuntu-2404, macos-26, windows-latest]
os: [blacksmith-8vcpu-ubuntu-2404, xcode-27, windows-latest]
steps:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
with:
Expand All @@ -282,6 +287,11 @@ jobs:
working-directory: .
run: bash scripts/ci/verify-nix-runtime.sh

- name: Select pinned Xcode
if: runner.os == 'macOS'
working-directory: .
run: python3 scripts/ci/select-xcode.py

- name: Install pinned Windows Rust
if: runner.os == 'Windows'
uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable action, exact toolchain below
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/agent-desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ jobs:
name: Build macOS binary (${{ matrix.variant }})
needs: changes
if: ${{ always() && !cancelled() && (needs.changes.result != 'success' || needs.changes.outputs.agent != 'false') && (github.event_name == 'pull_request' || (github.repository == 'MaplePrivacyLabs/Maple' && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch'))) }}
runs-on: blacksmith-6vcpu-macos-26
# gpui compiles Metal shaders, and Blacksmith's macOS 27 image has no Metal
# Toolchain for Xcode 27.1 and cannot download it (the MobileAsset catalog
# fetch fails). GitHub's xcode-27 image ships it, so build there meanwhile.
runs-on: xcode-27
timeout-minutes: 120
strategy:
fail-fast: false
Expand Down Expand Up @@ -172,7 +175,7 @@ jobs:
contents: read
id-token: write
attestations: write
runs-on: macos-26
runs-on: xcode-27
timeout-minutes: 120
strategy:
fail-fast: false
Expand Down Expand Up @@ -235,7 +238,7 @@ jobs:
name: Unsigned macOS packaging (${{ matrix.variant }})
needs: [changes, macos-build]
if: ${{ always() && !cancelled() && needs.macos-build.result == 'success' && github.event_name == 'pull_request' && (needs.changes.result != 'success' || needs.changes.outputs.agent != 'false') }}
runs-on: macos-26
runs-on: xcode-27
timeout-minutes: 120
strategy:
fail-fast: false
Expand Down Expand Up @@ -428,7 +431,7 @@ jobs:
permissions:
contents: read
attestations: read
runs-on: macos-26
runs-on: xcode-27
timeout-minutes: 30
strategy:
fail-fast: false
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/agent-store-performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON((github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && '[{"os":"blacksmith-8vcpu-ubuntu-2404","profile":"linux-ci","scale":"--ci"},{"os":"macos-26","profile":"macos-full","scale":"--full"}]' || '[{"os":"blacksmith-8vcpu-ubuntu-2404","profile":"linux-ci","scale":"--ci"}]') }}
include: ${{ fromJSON((github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && '[{"os":"blacksmith-8vcpu-ubuntu-2404","profile":"linux-ci","scale":"--ci"},{"os":"xcode-27","profile":"macos-full","scale":"--full"}]' || '[{"os":"blacksmith-8vcpu-ubuntu-2404","profile":"linux-ci","scale":"--ci"}]') }}
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' || github.event_name == 'push'
runs-on: ${{ matrix.os }}
timeout-minutes: 240
Expand All @@ -60,6 +60,11 @@ jobs:
working-directory: .
run: bash scripts/ci/verify-nix-runtime.sh

- name: Select pinned Xcode
if: runner.os == 'macOS'
working-directory: .
run: python3 scripts/ci/select-xcode.py

- name: Cache benchmark dependencies
uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
environment: desktop-signing
needs: changes
if: ${{ always() && !cancelled() && (needs.changes.result != 'success' || needs.changes.outputs.frontend != 'false' || needs.changes.outputs.macos != 'false') }}
runs-on: blacksmith-6vcpu-macos-26
runs-on: blacksmith-6vcpu-macos-27
steps:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # was v4
with:
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
verify-macos-desktop-artifacts:
needs:
- build-macos
runs-on: macos-26
runs-on: xcode-27
permissions:
contents: read
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/desktop-pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: build-macos${{ github.event.action == 'labeled' && format(' (label {0})', github.event.label.name) || '' }}
needs: changes
if: ${{ always() && !cancelled() && github.event.action != 'labeled' && (needs.changes.result != 'success' || needs.changes.outputs.macos != 'false') }}
runs-on: blacksmith-6vcpu-macos-26
runs-on: blacksmith-6vcpu-macos-27
steps:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # was v4
with:
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
concurrency:
group: research-dev-macos-pr-${{ github.event.pull_request.number }}
cancel-in-progress: true
runs-on: blacksmith-6vcpu-macos-26
runs-on: blacksmith-6vcpu-macos-27
steps:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # was v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ios-dev-testflight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
github.ref == 'refs/heads/master' &&
(github.event_name == 'push' || github.event_name == 'workflow_dispatch')
environment: apple-signing
runs-on: blacksmith-6vcpu-macos-26
runs-on: blacksmith-6vcpu-macos-27
timeout-minutes: 240
permissions:
contents: read
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
(github.event_name == 'push' || github.event_name == 'workflow_dispatch')
needs: build-ios-dev
environment: apple-signing
runs-on: macos-26
runs-on: xcode-27
timeout-minutes: 45
permissions:
contents: read
Expand Down
61 changes: 61 additions & 0 deletions .github/workflows/linux-runner-size-probe.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Experiment only, never merge. Does blacksmith-16vcpu-ubuntu-2404 (and 32)
# provision without a pre-created scale set, and how much faster is a cold Agent
# clippy + test build on 16/32 vCPU than on 8?
name: Linux runner size probe

on:
pull_request:
paths:
- .github/workflows/linux-runner-size-probe.yml

permissions:
contents: read

concurrency:
group: linux-runner-size-probe-${{ github.event.pull_request.number }}
cancel-in-progress: true

jobs:
probe:
name: Agent cold build on ${{ matrix.runner }}
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
runner: [blacksmith-8vcpu-ubuntu-2404, blacksmith-16vcpu-ubuntu-2404, blacksmith-32vcpu-ubuntu-2404]
steps:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
with:
persist-credentials: false

- name: Machine
run: |
echo "::notice::$(nproc) CPUs, $(free -g | awk '/Mem:/{print $2}') GB RAM on ${{ matrix.runner }}"

- name: Install pinned Nix environment
uses: DeterminateSystems/determinate-nix-action@96c5ee93a9dddf2830d31e1da6ec719077336c28 # v3.23.3
with:
source-tag: v3.23.3
github-token: ""

- name: Verify pinned Nix runtime
run: bash scripts/ci/verify-nix-runtime.sh

- name: Cold Agent clippy and test build
working-directory: apps/maple-agent
env:
RUSTFLAGS: -D warnings
CARGO_INCREMENTAL: "0"
run: |
set -euo pipefail
start=$SECONDS
nix develop --no-update-lock-file . -c true
shell=$((SECONDS - start))
start=$SECONDS
nix develop --no-update-lock-file . -c cargo clippy --workspace --all-targets --locked -- -D warnings
clippy=$((SECONDS - start))
start=$SECONDS
nix develop --no-update-lock-file . -c cargo test --workspace --locked --no-run
tests=$((SECONDS - start))
echo "::notice::${{ matrix.runner }}: shell ${shell}s, cold clippy ${clippy}s, cold test build ${tests}s"
Loading
Loading