From 8a7b3ded608e410d3bfe2ab933247bf7cca45f6e Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Wed, 3 Jan 2024 10:07:49 +0100 Subject: [PATCH] ci: Switch from FreeBSD 12.0 to FreeBSD 14.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit FreeBSD 12.0 is no longer supported since 14.0 is out. Change the CI manifest and refresh the rest. Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrangé --- ci/cirrus/{freebsd-12.vars => freebsd-14.vars} | 0 ci/gitlab/builds.yml | 12 ++++++------ ci/manifest.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) rename ci/cirrus/{freebsd-12.vars => freebsd-14.vars} (100%) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-14.vars similarity index 100% rename from ci/cirrus/freebsd-12.vars rename to ci/cirrus/freebsd-14.vars diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 4cb338fac9..414c663e47 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -1028,30 +1028,30 @@ mingw64-fedora-rawhide-local-env: # Native cirrus build jobs -x86_64-freebsd-12: +x86_64-freebsd-13: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: freebsd-12-4 + CIRRUS_VM_IMAGE_NAME: freebsd-13-2 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y - NAME: freebsd-12 + NAME: freebsd-13 UPDATE_COMMAND: pkg update UPGRADE_COMMAND: pkg upgrade -y -x86_64-freebsd-13: +x86_64-freebsd-14: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: freebsd-13-2 + CIRRUS_VM_IMAGE_NAME: freebsd-14-0 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y - NAME: freebsd-13 + NAME: freebsd-14 UPDATE_COMMAND: pkg update UPGRADE_COMMAND: pkg upgrade -y diff --git a/ci/manifest.yml b/ci/manifest.yml index afb1fa007d..a0f64df3fd 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -192,10 +192,10 @@ targets: allow-failure: true builds: false - freebsd-12: x86_64 - freebsd-13: x86_64 + freebsd-14: x86_64 + opensuse-leap-15: jobs: - arch: x86_64 -- 2.47.2