From 1489287bf1d4e685de375b5c7aeb06fe133addfc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 4 Jan 2023 15:20:54 +1000 Subject: gitlab CI: bump to newer Ubuntus Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 82 +++++++++++++++++++++++++-------------------------- .gitlab-ci/config.yml | 6 ++-- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84a0f92..e3ed292 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,49 +69,49 @@ variables: .fedora:34: extends: .fdo.distribution-image@fedora variables: - FDO_DISTRIBUTION_TAG: '2022-02-02.0' + FDO_DISTRIBUTION_TAG: '2023-01-04.5' FDO_DISTRIBUTION_VERSION: '34' .fedora:35: extends: .fdo.distribution-image@fedora variables: - FDO_DISTRIBUTION_TAG: '2022-02-02.0' + FDO_DISTRIBUTION_TAG: '2023-01-04.5' FDO_DISTRIBUTION_VERSION: '35' -.ubuntu:21.04: +.ubuntu:22.04: extends: .fdo.distribution-image@ubuntu variables: - FDO_DISTRIBUTION_TAG: '2022-02-02.0' - FDO_DISTRIBUTION_VERSION: '21.04' + FDO_DISTRIBUTION_TAG: '2023-01-04.5' + FDO_DISTRIBUTION_VERSION: '22.04' -.ubuntu:21.10: +.ubuntu:22.10: extends: .fdo.distribution-image@ubuntu variables: - FDO_DISTRIBUTION_TAG: '2022-02-02.0' - FDO_DISTRIBUTION_VERSION: '21.10' + FDO_DISTRIBUTION_TAG: '2023-01-04.5' + FDO_DISTRIBUTION_VERSION: '22.10' .debian:stable: extends: .fdo.distribution-image@debian variables: - FDO_DISTRIBUTION_TAG: '2022-02-02.0' + FDO_DISTRIBUTION_TAG: '2023-01-04.5' FDO_DISTRIBUTION_VERSION: 'stable' .debian:sid: extends: .fdo.distribution-image@debian variables: - FDO_DISTRIBUTION_TAG: '2022-02-02.0' + FDO_DISTRIBUTION_TAG: '2023-01-04.5' FDO_DISTRIBUTION_VERSION: 'sid' .arch:rolling: extends: .fdo.distribution-image@arch variables: - FDO_DISTRIBUTION_TAG: '2022-02-02.0' + FDO_DISTRIBUTION_TAG: '2023-01-04.5' FDO_DISTRIBUTION_VERSION: 'rolling' .alpine:latest: extends: .fdo.distribution-image@alpine variables: - FDO_DISTRIBUTION_TAG: '2022-02-02.0' + FDO_DISTRIBUTION_TAG: '2023-01-04.5' FDO_DISTRIBUTION_VERSION: 'latest' @@ -209,7 +209,7 @@ check-merge-request: - kvm variables: GIT_STRATEGY: none - FDO_DISTRIBUTION_TAG: qemu-2022-02-02.0 + FDO_DISTRIBUTION_TAG: qemu-2023-01-04.5 allow_failure: true # Always rebuilds the container @@ -270,9 +270,9 @@ fedora:35@container-forced-rebuild: # Pulls in the container from upstream or rebuilds it if missing -ubuntu:21.04@container-prep: +ubuntu:22.04@container-prep: extends: - - .ubuntu:21.04 + - .ubuntu:22.04 - .ubuntu.packages - .fdo.container-build@ubuntu stage: prep @@ -280,9 +280,9 @@ ubuntu:21.04@container-prep: GIT_STRATEGY: none # Always rebuilds the container -ubuntu:21.04@container-forced-rebuild: +ubuntu:22.04@container-forced-rebuild: extends: - - ubuntu:21.04@container-prep + - ubuntu:22.04@container-prep only: - schedules variables: @@ -290,9 +290,9 @@ ubuntu:21.04@container-forced-rebuild: # Pulls in the container from upstream or rebuilds it if missing -ubuntu:21.10@container-prep: +ubuntu:22.10@container-prep: extends: - - .ubuntu:21.10 + - .ubuntu:22.10 - .ubuntu.packages - .fdo.container-build@ubuntu stage: prep @@ -300,9 +300,9 @@ ubuntu:21.10@container-prep: GIT_STRATEGY: none # Always rebuilds the container -ubuntu:21.10@container-forced-rebuild: +ubuntu:22.10@container-forced-rebuild: extends: - - ubuntu:21.10@container-prep + - ubuntu:22.10@container-prep only: - schedules variables: @@ -434,19 +434,19 @@ fedora:35@container-clean: - .container-clean needs: ["fedora:35@container-prep"] -### ubuntu 21.04 -ubuntu:21.04@container-clean: +### ubuntu 22.04 +ubuntu:22.04@container-clean: extends: - - .ubuntu:21.04 + - .ubuntu:22.04 - .container-clean - needs: ["ubuntu:21.04@container-prep"] + needs: ["ubuntu:22.04@container-prep"] -### ubuntu 21.10 -ubuntu:21.10@container-clean: +### ubuntu 22.10 +ubuntu:22.10@container-clean: extends: - - .ubuntu:21.10 + - .ubuntu:22.10 - .container-clean - needs: ["ubuntu:21.10@container-prep"] + needs: ["ubuntu:22.10@container-prep"] ### debian stable debian:stable@container-clean: @@ -530,34 +530,34 @@ fedora:35@meson-build: needs: ['fedora:35@container-prep'] -ubuntu:21.04@autotools-build: +ubuntu:22.04@autotools-build: extends: - - .ubuntu:21.04 + - .ubuntu:22.04 - .autotools-build@template stage: autotools - needs: ['ubuntu:21.04@container-prep'] + needs: ['ubuntu:22.04@container-prep'] -ubuntu:21.04@meson-build: +ubuntu:22.04@meson-build: extends: - - .ubuntu:21.04 + - .ubuntu:22.04 - .meson-build@template stage: meson - needs: ['ubuntu:21.04@container-prep'] + needs: ['ubuntu:22.04@container-prep'] -ubuntu:21.10@autotools-build: +ubuntu:22.10@autotools-build: extends: - - .ubuntu:21.10 + - .ubuntu:22.10 - .autotools-build@template stage: autotools - needs: ['ubuntu:21.10@container-prep'] + needs: ['ubuntu:22.10@container-prep'] -ubuntu:21.10@meson-build: +ubuntu:22.10@meson-build: extends: - - .ubuntu:21.10 + - .ubuntu:22.10 - .meson-build@template stage: meson - needs: ['ubuntu:21.10@container-prep'] + needs: ['ubuntu:22.10@container-prep'] debian:stable@autotools-build: diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 3e94f38..1f621a6 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -3,7 +3,7 @@ # # We're happy to rebuild all containers when one changes. -.default_tag: &default_tag '2022-02-02.0' +.default_tag: &default_tag '2023-01-04.5' distributions: - name: fedora @@ -33,8 +33,8 @@ distributions: - name: ubuntu tag: *default_tag versions: - - '21.04' - - '21.10' + - '22.04' + - '22.10' packages: - git - gcc -- cgit v1.2.3