Skip to content

Commit

Permalink
Merge branch 'fix_native_compatibility_ci' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
LourensVeen committed Aug 2, 2024
2 parents f6756e0 + 29ba6ed commit 1209bb6
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 19 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci_macos14_clang.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ jobs:
run: |
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install pkg-config
python3 -m pip install --upgrade pip
pip3 install tox tox-gh-actions
python3 -m venv ~/tox_venv
. ~/tox_venv/bin/activate && python3 -m pip install --upgrade pip
. ~/tox_venv/bin/activate && python3 -m pip install tox tox-gh-actions
- name: Run all tests on macOS Sonoma 14 with Clang
run: cd ${GITHUB_WORKSPACE} && make test test_examples
run: cd ${GITHUB_WORKSPACE} && PATH=$PATH:~/tox_venv/bin make test test_examples

11 changes: 6 additions & 5 deletions .github/workflows/ci_macos14_gcc_gfortran.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@ jobs:

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest
xcode-version: 15.3

- name: Install dependencies
run: |
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gcc
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gcc@14
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install pkg-config
python3 -m pip install --upgrade pip
pip3 install tox tox-gh-actions
python3 -m venv ~/tox_venv
. ~/tox_venv/bin/activate && python3 -m pip install --upgrade pip
. ~/tox_venv/bin/activate && pip3 install tox tox-gh-actions
- name: Run all tests
run: cd ${GITHUB_WORKSPACE} && CXX=g++-12 OMPI_CXX=g++-12 FC=gfortran-12 OMPI_FC=gfortran-12 make test test_examples
run: cd ${GITHUB_WORKSPACE} && PATH=$PATH:~/tox_venv/bin CXX=g++-14 OMPI_CXX=g++-14 FC=gfortran-14 OMPI_FC=gfortran-14 make test test_examples

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Run Continuous Integration for the latest Ubuntu release
# This mainly checks for issues/regressions in the native build
name: native_compatibility_ubuntu23.04
name: native_compatibility_ubuntu24.04
on:
schedule:
- cron: '30 7 * * 6'
Expand All @@ -16,5 +16,5 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Run tests on Ubuntu 23.04
run: docker run -v "${GITHUB_WORKSPACE}:/workspace" --env LC_ALL=C.UTF-8 --env LANG=C.UTF-8 --env DEBIAN_FRONTEND=noninteractive ubuntu:23.04 /bin/bash -c 'apt-get update && apt-get -y dist-upgrade && apt-get -y install build-essential cmake gfortran git valgrind libopenmpi-dev pkg-config python3 python3-pip python3-venv curl && apt-get -y remove libssl-dev && useradd -m -d /home/muscle3 muscle3 && su muscle3 -c -- "cp -r --preserve=mode /workspace /home/muscle3/muscle3" && su muscle3 -c -- "cd /home/muscle3/muscle3 && make test_examples"'
- name: Run tests on Ubuntu 24.04
run: docker run -v "${GITHUB_WORKSPACE}:/workspace" --env LC_ALL=C.UTF-8 --env LANG=C.UTF-8 --env DEBIAN_FRONTEND=noninteractive ubuntu:24.04 /bin/bash -c 'apt-get update && apt-get -y dist-upgrade && apt-get -y install build-essential cmake gfortran git valgrind libopenmpi-dev pkg-config python3 python3-pip python3-venv curl && apt-get -y remove libssl-dev && useradd -m -d /home/muscle3 muscle3 && su muscle3 -c -- "cp -r --preserve=mode /workspace /home/muscle3/muscle3" && su muscle3 -c -- "cd /home/muscle3/muscle3 && make test_examples"'
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Run Continuous Integration for the latest Ubuntu release
# This mainly checks for issues/regressions in the native build
name: native_compatibility_ubuntu23.04_clang
name: native_compatibility_ubuntu24.04_clang
on:
schedule:
- cron: '30 6 * * 6'
Expand All @@ -16,5 +16,5 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Run tests on Ubuntu 23.04 with Clang
run: docker run -v "${GITHUB_WORKSPACE}:/workspace" --env LC_ALL=C.UTF-8 --env LANG=C.UTF-8 --env DEBIAN_FRONTEND=noninteractive ubuntu:23.04 /bin/bash -c 'apt-get update && apt-get -y dist-upgrade && apt-get -y install build-essential clang cmake gfortran git valgrind libopenmpi-dev pkg-config python3 python3-pip python3-venv curl && apt-get -y remove libssl-dev && useradd -m -d /home/muscle3 muscle3 && su muscle3 -c -- "cp -r --preserve=mode /workspace /home/muscle3/muscle3" && su muscle3 -c -- "cd /home/muscle3/muscle3 && CXXFLAGS=-fPIE OMPI_CXX=clang++ CXX=clang++ make test_examples"'
- name: Run tests on Ubuntu 24.04 with Clang
run: docker run -v "${GITHUB_WORKSPACE}:/workspace" --env LC_ALL=C.UTF-8 --env LANG=C.UTF-8 --env DEBIAN_FRONTEND=noninteractive ubuntu:24.04 /bin/bash -c 'apt-get update && apt-get -y dist-upgrade && apt-get -y install build-essential clang cmake gfortran git valgrind libopenmpi-dev pkg-config python3 python3-pip python3-venv curl && apt-get -y remove libssl-dev && useradd -m -d /home/muscle3 muscle3 && su muscle3 -c -- "cp -r --preserve=mode /workspace /home/muscle3/muscle3" && su muscle3 -c -- "cd /home/muscle3/muscle3 && CXXFLAGS=-fPIE OMPI_CXX=clang++ CXX=clang++ make test_examples"'
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# Run Continuous Integration for the latest Ubuntu release
# This mainly checks for issues/regressions in the native build
name: native_compatibility_ubuntu23.04_intel
name: native_compatibility_ubuntu24.04_intel
on:
schedule:
- cron: '0 7 * * 6'
push:
branches:
- 'release-*'
- fix_native_compatibility_ci
- issue-25-intel-compiler-support
jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -17,5 +16,5 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Run tests on Ubuntu 23.04 with the Intel compiler
run: docker run -v "${GITHUB_WORKSPACE}:/workspace" --env LC_ALL=C.UTF-8 --env LANG=C.UTF-8 --env DEBIAN_FRONTEND=noninteractive ubuntu:23.04 /bin/bash -c 'apt-get update && apt-get -y install wget && wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB && mv GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB /etc/apt/trusted.gpg.d/intel-sw-products.asc && echo "deb https://apt.repos.intel.com/oneapi all main" >/etc/apt/sources.list.d/oneAPI.list && apt-get update && apt-get -y dist-upgrade && apt-get -y install build-essential cmake git valgrind pkg-config python3 python3-pip python3-venv curl intel-oneapi-compiler-dpcpp-cpp intel-oneapi-compiler-fortran intel-oneapi-mpi-devel && apt-get -y remove libssl-dev && useradd -m -d /home/muscle3 muscle3 && su muscle3 -c -- "cp -r --preserve=mode /workspace /home/muscle3/muscle3" && su muscle3 -c -- "cd /home/muscle3/muscle3 && . /opt/intel/oneapi/setvars.sh && MPICXX=\"mpiicpc -cxx=icpx\" CXX=icpx MPIFC=\"mpiifort -fc=ifx\" FC=ifx make test_examples"'
- name: Run tests on Ubuntu 24.04 with the Intel compiler
run: docker run -v "${GITHUB_WORKSPACE}:/workspace" --env LC_ALL=C.UTF-8 --env LANG=C.UTF-8 --env DEBIAN_FRONTEND=noninteractive ubuntu:24.04 /bin/bash -c 'apt-get update && apt-get -y install wget && wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB && mv GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB /etc/apt/trusted.gpg.d/intel-sw-products.asc && echo "deb https://apt.repos.intel.com/oneapi all main" >/etc/apt/sources.list.d/oneAPI.list && apt-get update && apt-get -y dist-upgrade && apt-get -y install build-essential cmake git valgrind pkg-config python3 python3-pip python3-venv curl intel-oneapi-compiler-dpcpp-cpp intel-oneapi-compiler-fortran intel-oneapi-mpi-devel && apt-get -y remove libssl-dev && useradd -m -d /home/muscle3 muscle3 && su muscle3 -c -- "cp -r --preserve=mode /workspace /home/muscle3/muscle3" && su muscle3 -c -- "cd /home/muscle3/muscle3 && . /opt/intel/oneapi/setvars.sh && MPICXX=\"mpiicpc -cxx=icpx\" CXX=icpx MPIFC=\"mpiifort -fc=ifx\" FC=ifx make test_examples"'
2 changes: 1 addition & 1 deletion libmuscle/cpp/src/libmuscle/tests/test_instance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ struct libmuscle_instance_base : ::testing::Test, ConnectedPortManagerFixture {
std::vector<std::string>());

MockSettingsManager::return_value.get_setting.side_effect = [](
Reference const &, Reference const &) -> SettingValue {
Reference const &, Reference const &) -> const SettingValue & {
throw std::out_of_range("No settings set in mock, unset or replace side_effect");
};
}
Expand Down

0 comments on commit 1209bb6

Please sign in to comment.