gitlab CI: update to latest Fedoras

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7122b0f8fbe603fbc369534e4f4d833390ae309..59d31db3893d28e94a771c2eefa5207be83c9e9b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,17 +70,17 @@ variables:
   variables:
     MESON_TEST_ARGS: '--no-suite=needs-uinput'
 
-.fedora:37:
+.fedora:38:
   extends: .fdo.distribution-image@fedora
   variables:
     FDO_DISTRIBUTION_TAG: '2023-05-08.0'
-    FDO_DISTRIBUTION_VERSION: '37'
+    FDO_DISTRIBUTION_VERSION: '38'
 
-.fedora:38:
+.fedora:39:
   extends: .fdo.distribution-image@fedora
   variables:
     FDO_DISTRIBUTION_TAG: '2023-05-08.0'
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
 
 .ubuntu:23.04:
   extends: .fdo.distribution-image@ubuntu
@@ -201,9 +201,9 @@ check-merge-request:
 
 
 # Pulls in the container from upstream or rebuilds it if missing
-fedora:37@container-prep:
+fedora:38@container-prep:
   extends:
-    - .fedora:37
+    - .fedora:38
     - .fedora.packages
     - .fdo.container-build@fedora
   stage: prep
@@ -211,9 +211,9 @@ fedora:37@container-prep:
     GIT_STRATEGY: none
 
 # Always rebuilds the container
-fedora:37@container-forced-rebuild:
+fedora:38@container-forced-rebuild:
   extends:
-    - fedora:37@container-prep
+    - fedora:38@container-prep
   only:
     - schedules
   variables:
@@ -221,9 +221,9 @@ fedora:37@container-forced-rebuild:
 
 
 # Pulls in the container from upstream or rebuilds it if missing
-fedora:38@container-prep:
+fedora:39@container-prep:
   extends:
-    - .fedora:38
+    - .fedora:39
     - .fedora.packages
     - .fdo.container-build@fedora
   stage: prep
@@ -231,9 +231,9 @@ fedora:38@container-prep:
     GIT_STRATEGY: none
 
 # Always rebuilds the container
-fedora:38@container-forced-rebuild:
+fedora:39@container-forced-rebuild:
   extends:
-    - fedora:38@container-prep
+    - fedora:39@container-prep
   only:
     - schedules
   variables:
@@ -389,13 +389,6 @@ alpine:latest@container-forced-rebuild:
   only:
     - schedules
 
-### fedora 37
-fedora:37@container-clean:
-  extends:
-    - .fedora:37
-    - .container-clean
-  needs: ["fedora:37@container-prep"]
-
 ### fedora 38
 fedora:38@container-clean:
   extends:
@@ -403,6 +396,13 @@ fedora:38@container-clean:
     - .container-clean
   needs: ["fedora:38@container-prep"]
 
+### fedora 39
+fedora:39@container-clean:
+  extends:
+    - .fedora:39
+    - .container-clean
+  needs: ["fedora:39@container-prep"]
+
 ### ubuntu 23.04
 ubuntu:23.04@container-clean:
   extends:
@@ -467,34 +467,34 @@ alpine:latest@container-clean:
   dependencies: []
 
 
-fedora:37@autotools-build:
+fedora:38@autotools-build:
   extends:
-    - .fedora:37
+    - .fedora:38
     - .autotools-build@template
   stage: autotools
-  needs: ['fedora:37@container-prep']
+  needs: ['fedora:38@container-prep']
 
-fedora:37@meson-build:
+fedora:38@meson-build:
   extends:
-    - .fedora:37
+    - .fedora:38
     - .meson-build@template
   stage: meson
-  needs: ['fedora:37@container-prep']
+  needs: ['fedora:38@container-prep']
 
 
-fedora:38@autotools-build:
+fedora:39@autotools-build:
   extends:
-    - .fedora:38
+    - .fedora:39
     - .autotools-build@template
   stage: autotools
-  needs: ['fedora:38@container-prep']
+  needs: ['fedora:39@container-prep']
 
-fedora:38@meson-build:
+fedora:39@meson-build:
   extends:
-    - .fedora:38
+    - .fedora:39
     - .meson-build@template
   stage: meson
-  needs: ['fedora:38@container-prep']
+  needs: ['fedora:39@container-prep']
 
 
 ubuntu:23.04@autotools-build:
@@ -593,10 +593,10 @@ alpine:latest@meson-build:
 # because they're supposed to fail equally on all
 .fedora-custom-build@autotools-template:
   extends:
-    - .fedora:37
+    - .fedora:38
     - .autotools-build@template
   stage: build
-  needs: ['fedora:37@container-prep']
+  needs: ['fedora:38@container-prep']
 
 no-valgrind:autotools:
   extends: .fedora-custom-build@autotools-template
@@ -635,10 +635,10 @@ enable-gcov:autotools:
 
 .fedora-custom-build@meson-template:
   extends:
-    - .fedora:37
+    - .fedora:38
     - .meson-build@template
   stage: build
-  needs: ['fedora:37@container-prep']
+  needs: ['fedora:38@container-prep']
 
 no-valgrind:meson:
   extends: .fedora-custom-build@meson-template
@@ -689,7 +689,7 @@ static-build:meson:
 
 soname:
   extends:
-    - .fedora:37
+    - .fedora:38
   stage: build
   script:
   - ./autogen.sh --prefix=$PWD/prefix-autotools/
@@ -698,7 +698,7 @@ soname:
   - meson "$MESON_BUILDDIR" --prefix=$PWD/prefix-meson/
   - ninja -C "$MESON_BUILDDIR" install
   - ls -l $PWD/prefix-meson/lib64/libevdev.so.2.3.0
-  needs: ['fedora:37@container-prep']
+  needs: ['fedora:38@container-prep']
 
 #################################################################
 #                                                               #
@@ -742,10 +742,10 @@ qemu:meson:
   stage: VM
   extends:
     - .fdo.distribution-image@fedora
-    - .fedora:38
+    - .fedora:39
     - .build-in-b2c@template
   needs:
-    - "fedora:38@container-prep"
+    - "fedora:39@container-prep"
 
 qemu:meson:valgrind:
   extends:
@@ -756,7 +756,7 @@ qemu:meson:valgrind:
 
 meson-from-tarball:
   extends:
-    - .fedora:38
+    - .fedora:39
   stage: tarballs
   script:
     - export INSTALLDIR="$PWD/_inst"
@@ -774,11 +774,11 @@ meson-from-tarball:
     - ninja -C "$MESON_BUILDDIR" install
     - popd > /dev/null
     - ls -lR $INSTALLDIR
-  needs: ['fedora:38@container-prep']
+  needs: ['fedora:39@container-prep']
 
 autotools-from-tarball:
   extends:
-    - .fedora:38
+    - .fedora:39
   stage: tarballs
   script:
     - export INSTALLDIR="$PWD/_inst"
@@ -799,4 +799,4 @@ autotools-from-tarball:
   variables:
     LIBEVDEV_SKIP_ROOT_TESTS: 1
 
-  needs: ['fedora:38@container-prep']
+  needs: ['fedora:39@container-prep']

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index ff214e5467c9dce2a34e5e6148c458a8d2661c0b..9fe15f66357a3975df25422824bcfb01e4f577fc 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -12,8 +12,8 @@ distributions:
     # only one distro for qemu tests
     use_for_qemu_tests: true
     versions:
-      - '37'
       - '38'
+      - '39'
     packages:
       - git
       - gcc