diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94601538e..af150c6b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,6 +108,19 @@ jobs: echo "enabled=false" >> "$GITHUB_OUTPUT" fi + - name: Verify Fedora latest version + run: | + # Dynamically verify what Fedora version is "latest" from the container image + LATEST_VERSION=$(skopeo inspect --no-tags docker://quay.io/fedora/fedora:latest | jq -r '.Labels."org.opencontainers.image.version" // .Labels.version') + echo "Fedora latest container version: $LATEST_VERSION" + + # Verify it matches our hard-coded version (45) + if [[ "$LATEST_VERSION" != "45" ]]; then + echo "::warning::Fedora latest is now version $LATEST_VERSION, but CI is configured for fedora-45. Consider updating the matrix." + else + echo "✓ Fedora latest version matches CI configuration (45)" + fi + - name: Compute OS matrices id: matrix run: | @@ -119,10 +132,11 @@ jobs: if [[ "$DOCS_ONLY" != "true" ]] && { [[ "$EVENT" == "merge_group" || "$EVENT" == "workflow_dispatch" ]] \ || [[ "$EVENT" == "pull_request" && "$MERGE_QUEUE_ENABLED" != "true" ]] \ || echo "$LABELS" | jq -e 'index("ci/merge")' > /dev/null; }; then - # Full suite: all OSes - echo 'package_os_matrix=["fedora-44","fedora-45","fedora-46","centos-9","centos-10"]' >> "$GITHUB_OUTPUT" - echo 'integration_os_matrix=["fedora-44","centos-9","centos-10"]' >> "$GITHUB_OUTPUT" - echo 'upgrade_os_matrix=["fedora-44","centos-10"]' >> "$GITHUB_OUTPUT" + # Full suite: fedora-latest-stable + CentOS + # Using fedora-45 as latest stable (matching Packit's fedora-latest-stable) + echo 'package_os_matrix=["fedora-45","centos-9","centos-10"]' >> "$GITHUB_OUTPUT" + echo 'integration_os_matrix=["fedora-45","centos-9","centos-10"]' >> "$GITHUB_OUTPUT" + echo 'upgrade_os_matrix=["fedora-45","centos-10"]' >> "$GITHUB_OUTPUT" echo 'run_heavy=true' >> "$GITHUB_OUTPUT" elif [[ "$DOCS_ONLY" != "true" ]] && echo "$LABELS" | jq -e 'index("ci/tier-1")' > /dev/null; then # Tier-1 only: centos-10 @@ -255,8 +269,6 @@ jobs: test_os: ${{ fromJson(needs.compute-ci-level.outputs.package_os_matrix) }} runs-on: ubuntu-26.04 - # Rawhide is best-effort; don't let it block merges - continue-on-error: ${{ matrix.test_os == 'fedora-46' }} steps: - uses: actions/checkout@v7 @@ -335,9 +347,7 @@ jobs: - variant: ostree bootloader: systemd - # For now only have grub-cc tests in F44 - - test_os: fedora-45 - bootloader: grub-cc + # For now only have grub-cc tests in F45 - test_os: centos-9 bootloader: grub-cc - test_os: centos-10 @@ -445,10 +455,6 @@ jobs: matrix: test_os: ${{ fromJson(needs.compute-ci-level.outputs.upgrade_os_matrix) }} variant: [ostree, composefs] - # TODO: Re-enable this after 1.16.8 is released - exclude: - - test_os: fedora-44 - variant: composefs runs-on: ubuntu-26.04