diff --git a/.ci_fedora.sh b/.ci_fedora.sh index f1f123cd19..e1dc563c6c 100755 --- a/.ci_fedora.sh +++ b/.ci_fedora.sh @@ -21,11 +21,10 @@ then cmd="sudo docker" fi test . != ".$2" && mpi="$2" || mpi=openmpi - test . != ".$3" && version="$3" || version=rawhide - time $cmd pull registry.fedoraproject.org/fedora:$version + time $cmd pull ghcr.io/dschwoerer/bout-container-base:ci-fedora time $cmd create --cap-add=SYS_PTRACE --security-opt seccomp=unconfined \ --shm-size 256M \ - --name mobydick registry.fedoraproject.org/fedora:$version \ + --name mobydick ghcr.io/dschwoerer/bout-container-base:ci-fedora \ /tmp/BOUT-dev/.ci_fedora.sh $mpi time $cmd cp ${TRAVIS_BUILD_DIR:-$(pwd)} mobydick:/tmp/BOUT-dev time $cmd start -a mobydick @@ -34,27 +33,8 @@ fi test . != ".$1" && mpi="$1" || mpi=openmpi -## If we are called as root, setup everything -if [ $UID -eq 0 ] -then - cat /etc/os-release - # Ignore weak depencies - echo "install_weak_deps=False" >> /etc/dnf/dnf.conf - echo "minrate=10M" >> /etc/dnf/dnf.conf - export FORCE_COLUMNS=200 - time dnf -y install dnf5 - time dnf5 -y install dnf5-plugins cmake python3-zoidberg python3-natsort python3-boututils wget - # Allow to override packages - see #2073 - time dnf5 copr enable -y davidsch/fixes4bout || : - time dnf5 -y upgrade - time dnf5 -y builddep bout++ - useradd test - cp -a /tmp/BOUT-dev /home/test/ - chown -R test /home/test - chmod u+rwX /home/test -R - su - test -c "${0/\/tmp/\/home\/test} $mpi" ## If we are called as normal user, run test -else + cp -a /tmp/BOUT-dev /home/test/ . /etc/profile.d/modules.sh module load mpi/${1}-x86_64 export OMPI_MCA_rmaps_base_oversubscribe=yes @@ -76,4 +56,3 @@ else time make -C build build-check -j 2 time make -C build check -fi diff --git a/.github/workflows/black-fix.yml b/.github/workflows/black-fix.yml index 6c1bfed4a5..5cddbbfac6 100644 --- a/.github/workflows/black-fix.yml +++ b/.github/workflows/black-fix.yml @@ -41,6 +41,6 @@ jobs: ls $HOME/.local/bin/black tests/ tools/ $(grep -EIlr '^#!.*python.*$' bin/ tests/ tools/ src/ | grep -v _boutpp_build) - - uses: stefanzweifel/git-auto-commit-action@v5 + - uses: stefanzweifel/git-auto-commit-action@v7 with: commit_message: "Apply black changes" diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index e32c959cb2..4c1307d7c9 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -28,6 +28,6 @@ jobs: while ! git clang-format origin/${{ github.base_ref }} ; do git add . ; done - name: Commit to the PR branch - uses: stefanzweifel/git-auto-commit-action@v5 + uses: stefanzweifel/git-auto-commit-action@v7 with: commit_message: "Apply clang-format changes" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d6834eba6a..314ee196ae 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -209,7 +209,7 @@ jobs: with: submodules: true - name: Build Fedora - run: ./.ci_fedora.sh setup openmpi latest + run: ./.ci_fedora.sh setup openmpi shell: bash env: TRAVIS_BUILD_DIR: ${{ github.workspace }} @@ -219,7 +219,7 @@ jobs: container: ghcr.io/ggeorgakoudis/boutdev-cuda:latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: submodules: true - name: Build minimal CUDA 12.2 @ GCC9.4.0 @ Ubuntu 20.04 diff --git a/CMakeLists.txt b/CMakeLists.txt index cc368a3b32..44d100e444 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -465,7 +465,7 @@ set(BOUT_LIB_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib") set_target_properties(bout++ PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${BOUT_LIB_PATH}" ARCHIVE_OUTPUT_DIRECTORY "${BOUT_LIB_PATH}" - SOVERSION 5.1.0) + SOVERSION 5.2.0) # Set some variables for the bout-config script set(CONFIG_LDFLAGS "${CONFIG_LDFLAGS} -L\$BOUT_LIB_PATH -lbout++")