From a43d9f18d06a3c97746702b06273ca34625307d2 Mon Sep 17 00:00:00 2001 From: Nick Neisen Date: Thu, 11 Jul 2024 13:45:02 -0600 Subject: [PATCH 1/3] Update CI ubuntu version to 24.04 --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 9e3cddfea..125f7fdc9 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -5,7 +5,7 @@ on: jobs: integration: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 steps: - name: Checkout cri-dockerd From 531b318307b02229855ee3f4c3e69022e5675454 Mon Sep 17 00:00:00 2001 From: Nick Neisen Date: Thu, 11 Jul 2024 13:47:28 -0600 Subject: [PATCH 2/3] Remove archived CentOS 7 --- packaging/rpm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/rpm/Makefile b/packaging/rpm/Makefile index 88aa406fc..422f523f1 100644 --- a/packaging/rpm/Makefile +++ b/packaging/rpm/Makefile @@ -43,7 +43,7 @@ SOURCE_FILES=app.tgz cri-docker.service cri-docker.socket LICENSE SOURCES=$(addprefix rpmbuild/SOURCES/, $(SOURCE_FILES)) FEDORA_RELEASES := fedora-36 fedora-35 -CENTOS_RELEASES := centos-stream centos-7 +CENTOS_RELEASES := .PHONY: help help: ## show make targets From ad47ac1ea6e2576c171dc15b433abc2be6d5b70e Mon Sep 17 00:00:00 2001 From: Nick Neisen Date: Thu, 11 Jul 2024 14:23:37 -0600 Subject: [PATCH 3/3] Ubuntu 22.04 --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 125f7fdc9..88a945cc2 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -5,7 +5,7 @@ on: jobs: integration: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 timeout-minutes: 60 steps: - name: Checkout cri-dockerd