Merge pull request #6128 from trws/update-containers

Update containers: el9, fedora40, noble, add arm64 for fedora40, el9, noble

Author: mergify[bot]

.github/workflows/main.yml

@@ -254,4 +254,8 @@ jobs:
         echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         docker manifest create fluxrm/flux-core:bookworm fluxrm/flux-core:bookworm-amd64 fluxrm/flux-core:bookworm-386 fluxrm/flux-core:bookworm-arm64
         docker manifest push fluxrm/flux-core:bookworm
+        for d in el9 noble fedora40 ; do
+          docker manifest create fluxrm/flux-core:$d fluxrm/flux-core:$d-amd64 fluxrm/flux-core:$d-arm64
+          docker manifest push fluxrm/flux-core:$d
+        done
 

.gitignore

@@ -97,6 +97,7 @@ compile_flags.txt
 # local editor config dirs
 .idea
 .clangd
+.cache
 
 # Rules to ignore auto-generated test harness scripts
 test_*.t

config/ax_code_coverage.m4

@@ -125,10 +125,10 @@ AC_DEFUN([AX_CODE_COVERAGE],[
 		dnl Build the code coverage flags
 		dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
 		CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
-		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-		CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
+		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage -fprofile-update=atomic"
+		CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage -fprofile-update=atomic"
 		CODE_COVERAGE_LIBS="-lgcov"
-		CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS"
+		CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS -fprofile-update=atomic"
 
 		AC_SUBST([CODE_COVERAGE_CPPFLAGS])
 		AC_SUBST([CODE_COVERAGE_CFLAGS])

doc/requirements.txt

@@ -0,0 +1 @@
+../scripts/requirements-doc.txt

doc/requirements.txt

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+mkdir caliper
+pushd caliper
+wget -O - https://github.com/LLNL/Caliper/archive/v1.7.0.tar.gz | tar xvz --strip-components 1
+# patch for uint32_t error
+sed -i '39i#include <stdint.h>' include/caliper/common/Record.h
+cmake -B build -DCMAKE_INSTALL_PREFIX=/usr -DWITH_GOTCHA=Off
+cmake --build build -j 4 -t install
+popd
+rm -rf caliper

scripts/fetch-and-build-caliper.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+mkdir catch2
+pushd catch2
+wget -O - https://github.com/catchorg/Catch2/archive/refs/tags/v3.6.0.tar.gz | tar xvz --strip-components 1
+cmake -B build -DCMAKE_INSTALL_PREFIX=/usr
+cmake --build build -j 4 -t install
+popd
+rm -rf catch2

scripts/fetch-and-build-catch.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+mkdir catch2
+pushd catch2
+wget -O - https://www.mpich.org/static/downloads/4.2.2/mpich-4.2.2.tar.gz | tar xvz --strip-components 1
+mkdir -p build
+pushd build
+../configure --prefix=/usr --without-pmix
+make -j 4 install
+popd
+popd
+rm -rf catch2
+

scripts/fetch-and-build-mpich.sh

@@ -0,0 +1,9 @@
+markupsafe==2.0.0
+coverage
+cffi
+ply
+six
+pyyaml
+jsonschema>=2.6,<4.0
+sphinxcontrib-spelling
+-r requirements-doc.txt

scripts/requirements-ci.txt

@@ -0,0 +1,5 @@
+sphinx<6.0.0
+sphinx-rtd-theme>=0.5.2
+docutils>=0.14,<0.18
+urllib3<2
+jinja2<3.1.0