diff --git a/.github/workflows/root-ci-config/buildconfig/alma9-clang.txt b/.github/workflows/root-ci-config/buildconfig/alma9-clang.txt deleted file mode 100644 index dba272151c9f7..0000000000000 --- a/.github/workflows/root-ci-config/buildconfig/alma9-clang.txt +++ /dev/null @@ -1,4 +0,0 @@ -builtin_vdt=ON -ccache=ON -minuit2_omp=OFF -tmva-sofie=ON diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 377774f8ef903..90f6f07d7c2e3 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -393,7 +393,7 @@ jobs: property: arm64 overrides: ["CMAKE_BUILD_TYPE=RelWithDebInfo", "builtin_zlib=ON", "builtin_zstd=ON"] architecture: ARM64 - - image: alma9-clang + - image: alma10 is_special: true property: "clang Ninja" overrides: ["CMAKE_C_COMPILER=clang", "CMAKE_CXX_COMPILER=clang++"] diff --git a/roottest/requirements.txt b/roottest/requirements.txt deleted file mode 100644 index a8b0c151902ac..0000000000000 --- a/roottest/requirements.txt +++ /dev/null @@ -1,15 +0,0 @@ -# roottest requirements for third-party Python packages -# These are in addition to ROOT's requirements.txt! - -IPython -jupyter -pytest -# nbconvert 7.3 has a bug that does not respect --output option -# See https://github.com/jupyter/nbconvert/issues/1970 -nbconvert != 7.3.* - -# Needed by tutorials (run as part of roottest) -pandas - -# Needed by pyroot/tests -setuptools # for pkg_resources diff --git a/test/stressGraphics.ref b/test/stressGraphics.ref index a894796951c36..47c4ca0972f3c 100644 --- a/test/stressGraphics.ref +++ b/test/stressGraphics.ref @@ -53,7 +53,7 @@ Test# PS1Ref# PS1Err# PDFRef# PDFErr# JPGRef# JPGErr# PNGRef# PN 52 270825 10000 115500 1000 45496 11000 34685 5000 272950 10000 53 15025 3000 29289 500 42525 11300 33336 3900 14787 4000 54 254604 5000 383258 7000 55666 30400 46534 6500 259594 7000 - 55 4846 150 14075 150 33239 600 25303 300 4877 150 + 55 4846 150 14075 150 33239 600 25303 500 4877 150 56 1435879 150000 12837 100 25830 100 365000 15000 1085792 250000 57 5884 500 16577 200 40706 14000 30026 4000 5884 500 58 5723 700 15720 200 32236 11000 16916 3200 5670 800