summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Wellnhofer <wellnhofer@aevum.de>2022-10-24 14:56:26 +0200
committerNick Wellnhofer <wellnhofer@aevum.de>2022-10-25 19:34:38 +0200
commit66f781cf385bf690892b48c181257841841d3d41 (patch)
tree49209554a90c3b32fe3ef77eb7e9da9771cd47b0
parent80e43d1b768fbbb7f5b14328cf11e03af96fc3dd (diff)
downloadlibxml2-66f781cf385bf690892b48c181257841841d3d41.tar.gz
gitlab-ci: Upgrade image to Ubuntu 22.10, reenable MSan
MSan and 64-bit stat was broken on Ubuntu 22.04 (glibc >= 2.33, LLVM <= 14), see https://github.com/llvm/llvm-project/commit/1f82d0f7
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--.gitlab-ci/Dockerfile2
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ac0ee80..6ad29603 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,15 +43,15 @@ clang:asan:
UBSAN_OPTIONS: "print_stacktrace=1"
ASAN_SYMBOLIZER_PATH: "$CI_PROJECT_DIR/.gitlab-ci/llvm-symbolizer"
-# Disabled, MSan seems broken on Ubntu 22.04
-.clang:msan:
+clang:msan:
extends: .test
- only:
- - schedules
+# only:
+# - schedules
variables:
CONFIG: "--without-python --without-zlib --without-lzma"
CC: clang
CFLAGS: "-O2 -g -fno-omit-frame-pointer -fsanitize=memory -Wno-error=cast-align"
+ MSAN_SYMBOLIZER_PATH: "$CI_PROJECT_DIR/.gitlab-ci/llvm-symbolizer"
.mingw:
tags:
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 102657bd..3937c7d1 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,7 +1,7 @@
# The image is also used for libxslt, that's why we need git and
# libgcrypt-dev.
-FROM ubuntu:22.04
+FROM ubuntu:22.10
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get upgrade -y && \