From 7d9fa64952d7806cb47319e56635b25663cc5a7e Mon Sep 17 00:00:00 2001 From: ice Zeus <16010431+ice-zeus@users.noreply.github.com> Date: Thu, 29 Oct 2026 01:02:41 +0400 Subject: [PATCH] CIOD-12: jobs run on the CI-SelfHosted labels (ci-2cpu, ci-4cpu) Each job's runs-on names a ciod label instead of the old pool's: changes and docs on ci-2cpu; lint, test, android and linux on ci-4cpu; actionlint.yaml lists ci-2cpu, ci-4cpu and ci-8cpu. Job names are unchanged, so required checks stay valid. Comments that described the old pool's labels or its machine-slot wait describe the one-job runners; timeout-minutes values are unchanged. --- .github/actionlint.yaml | 4 ++-- .github/ci/setup.sh | 2 +- .github/workflows/ci.yml | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index 7c36512..b25b196 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -1,3 +1,3 @@ -# The CI pool runners' labels (.github/workflows/ci.yml), for actionlint. +# The CI-SelfHosted runners' labels (.github/workflows/ci.yml), for actionlint. self-hosted-runner: - labels: [ci-heavy] + labels: [ci-2cpu, ci-4cpu, ci-8cpu] diff --git a/.github/ci/setup.sh b/.github/ci/setup.sh index 4fd61d0..04fd4ae 100755 --- a/.github/ci/setup.sh +++ b/.github/ci/setup.sh @@ -116,7 +116,7 @@ android_sdk() { "$tools/bin/sdkmanager" --sdk_root="$sdk" "${ANDROID_PACKAGES[@]}" >/dev/null touch "$stamp" fi - # Overrides the project's 8 GB Gradle heap: ci-heavy servers have 8 GB in total. + # Overrides the project's 8 GB Gradle heap: ci-4cpu runners have 8 GB in total. env_set GRADLE_USER_HOME "$ROOT/gradle" mkdir -p "$ROOT/gradle" printf '%s\n' 'org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=1g' 'org.gradle.daemon=false' \ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7548d91..24955dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,8 @@ # Tier-1 merge gate (PROJECT checks; README.md and docs/development.md list the # commands), run on every ready pull request and on every push to main. # -# Every job runs on the shared CI pool's self-hosted runners (`ci-heavy`: the -# servers are identical and none is pinned). Pinned toolchains (Flutter, JDK, +# Every job runs on a fresh one-job CI-SelfHosted runner (`ci-4cpu`; `ci-2cpu` +# for changes and docs). Pinned toolchains (Flutter, JDK, # Android SDK, Python tools) are installed by .github/ci/setup.sh into # $CI_CACHE_DIR/proxy-app and reused across runs; nothing else is cached. A job-started hook on the servers refuses every job # except the owner's own pull requests from branches of this repository, pushes @@ -42,7 +42,7 @@ jobs: changes: name: changes if: github.event_name != 'pull_request' || !github.event.pull_request.draft - runs-on: [self-hosted, ci-heavy] + runs-on: [self-hosted, ci-2cpu] timeout-minutes: 5 outputs: code: ${{ steps.diff.outputs.code }} @@ -74,7 +74,7 @@ jobs: docs: name: docs needs: changes - runs-on: [self-hosted, ci-heavy] + runs-on: [self-hosted, ci-2cpu] timeout-minutes: 10 steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -93,7 +93,7 @@ jobs: name: format and analyze needs: changes if: needs.changes.outputs.code == 'true' - runs-on: [self-hosted, ci-heavy] + runs-on: [self-hosted, ci-4cpu] timeout-minutes: 20 steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -118,7 +118,7 @@ jobs: name: tests and changed-line coverage needs: changes if: needs.changes.outputs.code == 'true' - runs-on: [self-hosted, ci-heavy] + runs-on: [self-hosted, ci-4cpu] timeout-minutes: 30 steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -169,7 +169,7 @@ jobs: name: android debug APKs needs: changes if: needs.changes.outputs.android == 'true' - runs-on: [self-hosted, ci-heavy] + runs-on: [self-hosted, ci-4cpu] timeout-minutes: 60 steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -183,7 +183,7 @@ jobs: name: linux debug build and native/updater needs: changes if: needs.changes.outputs.linux == 'true' - runs-on: [self-hosted, ci-heavy] + runs-on: [self-hosted, ci-4cpu] timeout-minutes: 45 steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1