Using an updated toolchain means we're likely to catch more
issues.
Signed-off-by: Andrea Bolognani <abolo...@redhat.com>
---
ci/gitlab.yml | 16 ++++++++--------
ci/manifest.yml | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index f93f6222e8..07ad36809d 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -581,31 +581,31 @@ x86_64-ubuntu-2004:
- x86_64-ubuntu-2004-container
allow_failure: false
variables:
- ASAN_OPTIONS: verify_asan_link_order=0
- MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
NAME: ubuntu-2004
- UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
-x86_64-ubuntu-2004-clang:
+x86_64-ubuntu-2204:
extends: .native_build_job
needs:
- - x86_64-ubuntu-2004-container
+ - x86_64-ubuntu-2204-container
allow_failure: false
variables:
- CC: clang
+ ASAN_OPTIONS: verify_asan_link_order=0
MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
- NAME: ubuntu-2004
+ NAME: ubuntu-2204
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
-x86_64-ubuntu-2204:
+x86_64-ubuntu-2204-clang:
extends: .native_build_job
needs:
- x86_64-ubuntu-2204-container
allow_failure: false
variables:
+ CC: clang
+ MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
NAME: ubuntu-2204
+ UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 9a643be5b8..38582da3a6 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -209,7 +209,9 @@ targets:
PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
- ubuntu-2004:
+ ubuntu-2004: x86_64
+
+ ubuntu-2204:
jobs:
- arch: x86_64
variables:
@@ -223,5 +225,3 @@ targets:
CC: clang
MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
-
- ubuntu-2204: x86_64
--
2.35.1
