From: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue, 14 Mar 2023 08:50:34 +0000 (+0100)
Subject: ci: Upgrade fedora-release job to Fedora 38
X-Git-Tag: upstream/23.3.3~9259
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96dd3947875cc617a389223b1a064956f2dbcfad;p=platform%2Fupstream%2Fmesa.git

ci: Upgrade fedora-release job to Fedora 38

Need to add -Wno-error=dangling-reference -Wno-error=overloaded-virtual
for C++ for now.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22718>
---

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index ff80d61..d69ab9a 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -284,6 +284,9 @@ fedora-release:
     C_LINK_ARGS: >
       -Wno-error=stringop-overflow
       -Wno-error=stringop-overread
+    CPP_ARGS: >
+      -Wno-error=dangling-reference
+      -Wno-error=overloaded-virtual
     CPP_LINK_ARGS: >
       -Wno-error=stringop-overflow
       -Wno-error=stringop-overread
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 0b316fd..a1ab5a3 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -292,13 +292,13 @@ alpine/x86_build:
   needs:
     - alpine/x86_build
 
-# Fedora 36 based x86 build image
+# Fedora based x86 build image
 fedora/x86_build:
   extends:
     - .fdo.container-build@fedora
     - .container
   variables:
-    FDO_DISTRIBUTION_VERSION: 36
+    FDO_DISTRIBUTION_VERSION: 38
     MESA_IMAGE_TAG: &fedora-x86_build ${FEDORA_X86_BUILD_TAG}
 
 .use-fedora/x86_build:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index a8de07b..38f060b 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -20,7 +20,7 @@ variables:
    DEBIAN_X86_TEST_VK_TAG: "2023-04-24-deqp"
 
    ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump"
-   FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng"
+   FEDORA_X86_BUILD_TAG: "2023-04-26-f38"
    KERNEL_ROOTFS_TAG: "2023-04-26-skqp-12.1-r5"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"