From 2223f0532b5318561e30d972c6a9a34c54b39d51 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 23 Feb 2024 12:22:19 +0100 Subject: [PATCH 1/6] update documentation creation --- .github/workflows/create_documentation.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/create_documentation.yml b/.github/workflows/create_documentation.yml index 5888cfc81..e50ce545e 100644 --- a/.github/workflows/create_documentation.yml +++ b/.github/workflows/create_documentation.yml @@ -9,22 +9,18 @@ jobs: fail-fast: false matrix: config: - - name: "ubuntu-20" - os: ubuntu-20.04 - cxx: "g++-9" - cc: "gcc-9" - fc: "gfortran-9" - swig_builtin: "Off" #uses swig 4.0.1 + - name: "ubuntu-22" + os: ubuntu-22.04 + cxx: "g++-11" + cc: "gcc-11" + fc: "gfortran-11" + swig_builtin: "On" #uses swig 4.0.2 + py: "/usr/bin/python3" #python 3.10 # define steps to take steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Python install - uses: actions/setup-python@v4 - with: - python-version: '3.9' - cache: 'pip' # caching pip dependencies - name: Prerequirements run: | sudo apt-get update @@ -40,9 +36,7 @@ jobs: run: | mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local \ - -DENABLE_PYTHON=True -DENABLE_TESTING=ON -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} \ - -DSIMD_EXTENSIONS=native -DBUILD_DOC=True -DENABLE_COVERAGE=True + cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ - name: Build CRPropa run: | cd build From 67241b33190d41771e6ecfc506a66b46dbed1699 Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 23 Feb 2024 12:29:45 +0100 Subject: [PATCH 2/6] enable doc and coverage --- .github/workflows/create_documentation.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_documentation.yml b/.github/workflows/create_documentation.yml index e50ce545e..f76f56c18 100644 --- a/.github/workflows/create_documentation.yml +++ b/.github/workflows/create_documentation.yml @@ -36,7 +36,9 @@ jobs: run: | mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ + cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} + -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native + -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On - name: Build CRPropa run: | cd build From c32f08fb487af02d15806432926ac22d522a80e2 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 26 Feb 2024 08:41:22 +0100 Subject: [PATCH 3/6] add linebreak --- .github/workflows/create_documentation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_documentation.yml b/.github/workflows/create_documentation.yml index f76f56c18..f01b1ef47 100644 --- a/.github/workflows/create_documentation.yml +++ b/.github/workflows/create_documentation.yml @@ -36,8 +36,8 @@ jobs: run: | mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} - -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native + cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} \ + -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native \ -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On - name: Build CRPropa run: | From 99bccd95b3ceb79a316206796d9827fd34feaf69 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 26 Feb 2024 08:44:29 +0100 Subject: [PATCH 4/6] remove linebreak --- .github/workflows/create_documentation.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/create_documentation.yml b/.github/workflows/create_documentation.yml index f01b1ef47..a3f2e5c5f 100644 --- a/.github/workflows/create_documentation.yml +++ b/.github/workflows/create_documentation.yml @@ -36,9 +36,7 @@ jobs: run: | mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} \ - -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native \ - -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On + cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On - name: Build CRPropa run: | cd build From 106e32f4c9e5094e4c472e2d7d1053c3a6441022 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 26 Feb 2024 08:53:48 +0100 Subject: [PATCH 5/6] enable testing --- .github/workflows/create_documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_documentation.yml b/.github/workflows/create_documentation.yml index a3f2e5c5f..5db53278c 100644 --- a/.github/workflows/create_documentation.yml +++ b/.github/workflows/create_documentation.yml @@ -36,7 +36,7 @@ jobs: run: | mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On + cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On - name: Build CRPropa run: | cd build From 9c991e4178c291b088f76134347cb800de9226b2 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 26 Feb 2024 09:32:29 +0100 Subject: [PATCH 6/6] move from node 16 to node 20 --- .github/workflows/create_documentation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_documentation.yml b/.github/workflows/create_documentation.yml index 5db53278c..b1a0bee70 100644 --- a/.github/workflows/create_documentation.yml +++ b/.github/workflows/create_documentation.yml @@ -20,7 +20,7 @@ jobs: # define steps to take steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Prerequirements run: | sudo apt-get update @@ -57,7 +57,7 @@ jobs: make doc tar -zcvf documentation.tar.gz doc - name: archive documentation - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "documentation" path: |