diff --git a/.github/workflows/native-feed-post.yml b/.github/workflows/native-feed-post.yml index af247e0..38e1266 100644 --- a/.github/workflows/native-feed-post.yml +++ b/.github/workflows/native-feed-post.yml @@ -147,12 +147,12 @@ jobs: ctest --test-dir build-feed --output-on-failure release-macos: - name: Release (macos-14) + name: Release (macos-15) needs: [authz, main-ref] - runs-on: macos-14 + runs-on: macos-15 timeout-minutes: 30 env: - PF_CI_LABELS: '["macos-14"]' + PF_CI_LABELS: '["macos-15"]' steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Linux prerequisites diff --git a/.github/workflows/native-feed.yml b/.github/workflows/native-feed.yml index b132933..b111f1e 100644 --- a/.github/workflows/native-feed.yml +++ b/.github/workflows/native-feed.yml @@ -82,15 +82,15 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, ubuntu-24.04-arm, macos-14] + os: [ubuntu-24.04, ubuntu-24.04-arm, macos-15] include: - os: ubuntu-24.04 runner: ubuntu-24.04 - os: ubuntu-24.04-arm runner: ubuntu-24.04-arm # macOS has no dedicated hardware; every leg here is GitHub-hosted (CI-2 = A). - - os: macos-14 - runner: macos-14 + - os: macos-15 + runner: macos-15 runs-on: ${{ matrix.runner }} env: PF_CI_LABELS: '["ubuntu-24.04"]' diff --git a/tests/test_post_merge_workflows.py b/tests/test_post_merge_workflows.py index d8243a8..2e02201 100644 --- a/tests/test_post_merge_workflows.py +++ b/tests/test_post_merge_workflows.py @@ -29,7 +29,7 @@ NATIVE_ROUTES = { "release-amd64": ("Release (ubuntu-24.04)", "ubuntu-24.04"), "release-arm64": ("Release (ubuntu-24.04-arm)", "ubuntu-24.04-arm"), - "release-macos": ("Release (macos-14)", "macos-14"), + "release-macos": ("Release (macos-15)", "macos-15"), "asan-ubsan": ("ASan + UBSan", "ubuntu-24.04"), "tsan": ("TSan", "ubuntu-24.04"), } @@ -271,7 +271,7 @@ def test_post_authz_stays_canonical_and_pods_hold_no_credentials(stem: str) -> N @pytest.mark.parametrize("stem", PAIRS) def test_post_workflow_caps_each_label_at_eight_pods(stem: str) -> None: - hosted = {"ubuntu-24.04", "ubuntu-24.04-arm", "macos-14"} + hosted = {"ubuntu-24.04", "ubuntu-24.04-arm", "macos-15"} for job in load(stem, post=True)["jobs"].values(): route = job["runs-on"] if not isinstance(route, str): diff --git a/tests/test_pr_tier_workflows.py b/tests/test_pr_tier_workflows.py index 0db99c0..f155e4a 100644 --- a/tests/test_pr_tier_workflows.py +++ b/tests/test_pr_tier_workflows.py @@ -39,7 +39,7 @@ "ubuntu-24.04": "ubuntu-24.04", # old: "ubuntu-24.04-arm": "${{ fromJSON('[\"self-hosted\",\"pf-ci\",\"pf-ci-arm64\"]') }}", "ubuntu-24.04-arm": "ubuntu-24.04-arm", - "macos-14": "macos-14", + "macos-15": "macos-15", } # These expressions are rejection fixtures for the superseded hosted-fallback policy. OLD_ROUTE = ( @@ -149,7 +149,7 @@ def step_script(workflow: str, job: str, step_id: str) -> str: def assert_native_release_matrix(matrix: dict[str, Any]) -> None: - assert matrix["os"] == ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-14"] + assert matrix["os"] == ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-15"] includes = matrix["include"] by_os = {entry["os"]: entry for entry in includes} assert len(by_os) == len(includes), "matrix includes must not override the same OS twice" @@ -157,7 +157,7 @@ def assert_native_release_matrix(matrix: dict[str, Any]) -> None: assert set(by_os) == set(matrix["os"]) for os_name in matrix["os"]: # old: entry = by_os.get(os_name, {}) - # old: if os_name == "macos-14": assert "runner" not in entry + # macOS is hosted and must keep its explicit current runner label. # old: else: assert entry.get("runner") == MATRIX_RUNNERS[os_name] assert by_os[os_name].get("runner") == MATRIX_RUNNERS[os_name] @@ -360,19 +360,19 @@ def test_native_release_matrix_pins_every_runner_and_the_macos_exception() -> No ("ubuntu-24.04", GUARDED_ROUTE), # CI-2 = A: the self-hosted pool must not come back as a leg's runner. ("ubuntu-24.04", POOL_LABELS), - ("ubuntu-24.04", "macos-14"), + ("ubuntu-24.04", "macos-15"), ("ubuntu-24.04", MATRIX_RUNNERS["ubuntu-24.04-arm"]), ("ubuntu-24.04", "${{ " + POOL + " }}"), ("ubuntu-24.04-arm", ARM_POOL_LABELS), - ("ubuntu-24.04-arm", "macos-14"), + ("ubuntu-24.04-arm", "macos-15"), ("ubuntu-24.04-arm", MATRIX_RUNNERS["ubuntu-24.04"]), ( "ubuntu-24.04-arm", "${{ fromJSON('[\"self-hosted\",\"pf-ci\",\"pf-ci-arm64\"]') }}", ), - ("macos-14", MATRIX_RUNNERS["ubuntu-24.04"]), - ("macos-14", MATRIX_RUNNERS["ubuntu-24.04-arm"]), - ("macos-14", "ubuntu-24.04"), + ("macos-15", MATRIX_RUNNERS["ubuntu-24.04"]), + ("macos-15", MATRIX_RUNNERS["ubuntu-24.04-arm"]), + ("macos-15", "ubuntu-24.04"), ], ) def test_native_release_matrix_rejects_fallbacks_and_wrong_pools( @@ -381,7 +381,7 @@ def test_native_release_matrix_rejects_fallbacks_and_wrong_pools( original = load("native-feed.yml")["jobs"]["release"]["strategy"]["matrix"] assert_native_release_matrix(original) matrix = copy.deepcopy(original) - # old: matrix["include"].append({"os": os_name, "runner": runner}) for macos-14. + # Mutate the existing matrix leg in place so the negative row remains real. entry = next(entry for entry in matrix["include"] if entry["os"] == os_name) entry["runner"] = runner assert matrix != original @@ -397,7 +397,7 @@ def test_native_release_matrix_rejects_missing_or_extra_legs(fault: str) -> None matrix = copy.deepcopy(load("native-feed.yml")["jobs"]["release"]["strategy"]["matrix"]) assert_native_release_matrix(matrix) if fault == "missing-os": - matrix["os"].remove("macos-14") + matrix["os"].remove("macos-15") elif fault == "extra-os": matrix["os"].append("windows-latest") elif fault == "missing-linux-runner":