Merge pull request CRPropa#382 from lukasmerten/CICD

Update of CI
JulienDoerner · Dec 18, 2021 · f790e32 · f790e32
2 parents 7ceeba0 + a6baf73
commit f790e32
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 58 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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.
-Original file line number
+Diff line change
@@ Expand Up / @@ -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.