diff --git a/.github/workflows/full-release-validation.yml b/.github/workflows/full-release-validation.yml index d24589f4559..73e7053fc2e 100644 --- a/.github/workflows/full-release-validation.yml +++ b/.github/workflows/full-release-validation.yml @@ -92,7 +92,7 @@ env: jobs: resolve_target: name: Resolve target ref - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 10 outputs: sha: ${{ steps.resolve.outputs.sha }} @@ -160,7 +160,7 @@ jobs: name: Run normal full CI needs: [resolve_target] if: contains(fromJSON('["all","ci"]'), inputs.rerun_group) - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 240 outputs: run_id: ${{ steps.dispatch.outputs.run_id }} @@ -275,7 +275,7 @@ jobs: name: Run plugin prerelease validation needs: [resolve_target] if: contains(fromJSON('["all","plugin-prerelease"]'), inputs.rerun_group) - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 300 outputs: run_id: ${{ steps.dispatch.outputs.run_id }} @@ -373,7 +373,7 @@ jobs: name: Run release/live/Docker/QA validation needs: [resolve_target] if: contains(fromJSON('["all","release-checks","install-smoke","cross-os","live-e2e","package","qa","qa-parity","qa-live"]'), inputs.rerun_group) - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 720 outputs: run_id: ${{ steps.dispatch.outputs.run_id }} @@ -490,7 +490,7 @@ jobs: name: Run post-publish Telegram E2E needs: [resolve_target] if: inputs.npm_telegram_package_spec != '' && contains(fromJSON('["all","npm-telegram"]'), inputs.rerun_group) - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 120 outputs: run_id: ${{ steps.dispatch.outputs.run_id }} @@ -573,7 +573,7 @@ jobs: name: Verify full validation needs: [normal_ci, plugin_prerelease, release_checks, npm_telegram] if: always() - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 5 steps: - name: Request private evidence update diff --git a/.github/workflows/openclaw-release-checks.yml b/.github/workflows/openclaw-release-checks.yml index 30fd1d58be6..924621efcc7 100644 --- a/.github/workflows/openclaw-release-checks.yml +++ b/.github/workflows/openclaw-release-checks.yml @@ -66,7 +66,7 @@ env: jobs: resolve_target: - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 timeout-minutes: 30 permissions: contents: read @@ -801,7 +801,7 @@ jobs: - qa_live_matrix_release_checks - qa_live_telegram_release_checks if: always() - runs-on: blacksmith-4vcpu-ubuntu-2404 + runs-on: ubuntu-24.04 permissions: {} timeout-minutes: 5 steps: diff --git a/test/scripts/plugin-prerelease-test-plan.test.ts b/test/scripts/plugin-prerelease-test-plan.test.ts index 977890b28b1..db1f61c8a82 100644 --- a/test/scripts/plugin-prerelease-test-plan.test.ts +++ b/test/scripts/plugin-prerelease-test-plan.test.ts @@ -302,6 +302,18 @@ describe("scripts/lib/plugin-prerelease-test-plan.mjs", () => { group: "full-release-validation-${{ inputs.ref }}-${{ inputs.rerun_group }}", "cancel-in-progress": true, }); + expect(releaseChecksWorkflow.jobs.resolve_target["runs-on"]).toBe("ubuntu-24.04"); + expect(releaseChecksWorkflow.jobs.summary["runs-on"]).toBe("ubuntu-24.04"); + for (const jobName of [ + "resolve_target", + "normal_ci", + "plugin_prerelease", + "release_checks", + "npm_telegram", + "summary", + ]) { + expect(fullReleaseWorkflow.jobs[jobName]["runs-on"]).toBe("ubuntu-24.04"); + } }); it("keeps the live-ish availability check redacted", () => {