diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3818374dc7..17ed2424a4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,6 @@ jobs: vectfit=${{ matrix.vectfit }}) # How to handle when each individual dependency changes? # Should each dependency have its own individual cache? - # Or should they all be bundled together? - name: Environment Variables run: | @@ -137,6 +136,12 @@ jobs: if: ${{ matrix.vectfit == 'y' }} run: sudo apt install -y libblas-dev liblapack-dev + #- name: Install NJOY2016 + # uses: actions/cache@v4 + # with: + # path: "$HOME/NJOY2016" + # key: NJOY2016- + - name: install shell: bash run: | @@ -155,7 +160,7 @@ jobs: shell: bash run: $GITHUB_WORKSPACE/tools/ci/gha-before-script.sh - - name: test ## possibly refactor to make more + - name: test shell: bash run: | CTEST_OUTPUT_ON_FAILURE=1 make test -C $GITHUB_WORKSPACE/build/ diff --git a/tools/ci/gha-install-njoy.sh b/tools/ci/gha-install-njoy.sh index 8255ffea836..b045b7610dd 100755 --- a/tools/ci/gha-install-njoy.sh +++ b/tools/ci/gha-install-njoy.sh @@ -1,7 +1,14 @@ #!/bin/bash set -ex + +# NJOY variables +NJOY_BRANCH='main' +NJOY_REPO='https://github.com/njoy/NJOY2016' +NJOY_INSTALL_DIR=$HOME/NJOY2016/ + cd $HOME -git clone https://github.com/njoy/NJOY2016 -cd NJOY2016 +git clone -b $NJOY_BRANCH $NJOY_REPO +cd $NJOY_INSTALL_DIR mkdir build && cd build -cmake -Dstatic=on .. && make 2>/dev/null && sudo make install +cmake -Dstatic=on -DCMAKE_INSTALL_PREFIX=$NJOY_INSTALL_DIR .. +make 2>/dev/null && sudo make install \ No newline at end of file