Module: Mesa Branch: main Commit: 96dd3947875cc617a389223b1a064956f2dbcfad URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=96dd3947875cc617a389223b1a064956f2dbcfad
Author: Michel Dänzer <[email protected]> Date: Tue Mar 14 09:50:34 2023 +0100 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> --- .gitlab-ci/build/gitlab-ci.yml | 3 +++ .gitlab-ci/container/gitlab-ci.yml | 4 ++-- .gitlab-ci/image-tags.yml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index ff80d6120f7..d69ab9a3d85 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 0b316fd0ef4..a1ab5a39de3 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 a8de07b71eb..38f060b1ee3 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"
