diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index dabd2c825..550698189 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -60,50 +60,5 @@ jobs: with: name: "test-report_${{matrix.config.name}}" path: build/Testing/Temporary/LastTest.log - mac: - runs-on: ${{ matrix.config.os }} - strategy: - fail-fast: false - matrix: - config: - - name: "macos-1015" - os: macos-10.15 - cxx: "clang++" - cc: "clang" - fc: "gfortran-11" - swig_builtin: "On" #uses swig 4.0.2 - py: "/usr/bin/python" - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Preinstall - run: | - brew install hdf5 fftw cfitsio muparser libomp - - name: Set up the build - env: - CXX: ${{ matrix.config.cxx }} - CC: ${{ matrix.config.cc }} - FC: ${{ matrix.config.fc }} - CRPROPA_DATA_PATH: "/Users/runner/work/CRPropa3/CRPropa3/build/data" - run: | - mkdir build - cd build - cmake .. -DENABLE_PYTHON=True -DPYTHON_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} - - name: Build CRPropa - run: | - cd build - make - - name: Run tests - env: - CRPROPA_DATA_PATH: "/Users/runner/work/CRPropa3/CRPropa3/build/data" - run: | - cd build - make test - - name: Archive test results - if: always() - uses: actions/upload-artifact@v2 - with: - name: "test-report_${{matrix.config.name}}" - path: build/Testing/Temporary/LastTest.log diff --git a/.github/workflows/testing_OSX.yaml b/.github/workflows/testing_OSX.yaml new file mode 100644 index 000000000..94aa18345 --- /dev/null +++ b/.github/workflows/testing_OSX.yaml @@ -0,0 +1,48 @@ +name: crpropa-testing_OSX +on: [push] +jobs: + mac: + runs-on: ${{ matrix.config.os }} + strategy: + fail-fast: false + matrix: + config: + - name: "macos-11" + os: macos-11 + cxx: "clang++" + cc: "clang" + fc: "gfortran-11" + swig_builtin: "On" #uses swig 4.0.2 + py: "/usr/bin/python" + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Preinstall + run: | + brew install hdf5 fftw cfitsio muparser libomp + - name: Set up the build + env: + CXX: ${{ matrix.config.cxx }} + CC: ${{ matrix.config.cc }} + FC: ${{ matrix.config.fc }} + CRPROPA_DATA_PATH: "/Users/runner/work/CRPropa3/CRPropa3/build/data" + run: | + mkdir build + cd build + cmake .. -DENABLE_PYTHON=True -DPYTHON_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=avx + - name: Build CRPropa + run: | + cd build + make + - name: Run tests + env: + CRPROPA_DATA_PATH: "/Users/runner/work/CRPropa3/CRPropa3/build/data" + run: | + cd build + make test + - name: Archive test results + if: always() + uses: actions/upload-artifact@v2 + with: + name: "test-report_${{matrix.config.name}}" + path: build/Testing/Temporary/LastTest.log diff --git a/AUTHORS.md b/AUTHORS.md deleted file mode 100644 index 6c2725d29..000000000 --- a/AUTHORS.md +++ /dev/null @@ -1,12 +0,0 @@ -###CRPropa 3 Developers -In chronological order with main contributions, see also [contributor list](https://github.com/CRPropa/CRPropa3/graphs/contributors). - - * David Walz -- main developer - * Gero Müller -- main developer - * Daniel Kuempel -- ROOT output - * Rafael Alves Batista -- SAGA interface - * Tobias Winchen -- Galactic lensing, DINT & EleCa integration - * Andrej Dundovic -- ParticleCollector, SWIG and github integration - * Marcus Wirtz -- PT11 GMF - * Christopher Heiter -- EM interactions, EM production channels - * Lukas Merten -- Diffusion module & infrastructure diff --git a/README.md b/README.md index c08cf4afd..211220cf8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ CRPropa3 ======== [![Build status](https://github.com/crpropa/crpropa3/actions/workflows/testing.yml/badge.svg)](https://github.com/crpropa/crpropa3/actions/) -[![Coverage Status](https://coveralls.io/repos/github/CRPropa/CRPropa3/badge.svg)](https://coveralls.io/github/CRPropa/CRPropa3) [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/CRPropa/CRPropa3.svg)](https://isitmaintained.com/project/CRPropa/CRPropa3 "Average time to resolve an issue") [![Percentage of issues still open](https://isitmaintained.com/badge/open/CRPropa/CRPropa3.svg)](https://isitmaintained.com/project/CRPropa/CRPropa3 "Percentage of issues still open") diff --git a/doc/pages/Installation.md b/doc/pages/Installation.md index 922bc2a24..e6540a2e6 100644 --- a/doc/pages/Installation.md +++ b/doc/pages/Installation.md @@ -209,5 +209,6 @@ example: -DPYTHON_LIBRARY=/usr/local/Cellar/python/3.7.4/Frameworks/Python.framework/Versions/3.7/lib/libpython3.7.dylib \ .. ``` +Note, that CRPropa can be installed under OS X with the settings listed above, but due to some issues with github actions the OS X installation is currently not checked automatically.