From 3ea899fabd9d3a7a38f705c23d3162e35c10ecbb Mon Sep 17 00:00:00 2001 From: Thomas Hahn Date: Fri, 15 Nov 2024 17:57:45 -0500 Subject: [PATCH] [ghactions] Remove custom doxygen build and build docs on macos --- .github/workflows/build.yml | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f45e8bc..58bc9cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,9 +27,9 @@ jobs: matrix: include: - {os: ubuntu-24.04, cc: gcc, cxx: g++, doc: OFF} - - {os: ubuntu-24.04, cc: clang, cxx: clang++, doc: ON} + - {os: ubuntu-24.04, cc: clang, cxx: clang++, doc: OFF} - {os: macos-14, cc: gcc-14, cxx: g++-14, doc: OFF} - - {os: macos-14, cc: clang, cxx: clang++, doc: OFF} + - {os: macos-14, cc: clang, cxx: clang++, doc: ON} runs-on: ${{ matrix.os }} @@ -78,34 +78,23 @@ jobs: python3-sphinx python3-nbsphinx + - name: Set up virtualenv + run: | + mkdir $HOME/.venv + python3 -m venv --system-site-packages $HOME/.venv/my_python + source $HOME/.venv/my_python/bin/activate + echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV + echo "PATH=$PATH" >> $GITHUB_ENV + - name: Install homebrew dependencies if: ${{ contains(matrix.os, 'macos') }} run: | brew update - brew install ccache gcc llvm hdf5 open-mpi openblas - mkdir $HOME/.venv - python3 -m venv $HOME/.venv/my_python - source $HOME/.venv/my_python/bin/activate + brew install ccache gcc llvm hdf5 open-mpi openblas doxygen pip install mako numpy scipy mpi4py pip install -r requirements.txt - echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV echo "PATH=$(brew --prefix llvm)/bin:$(brew --prefix gcc)/bin:$PATH" >> $GITHUB_ENV - - - name: Build doxygen - if: matrix.doc == 'ON' - env: - CC: ${{ matrix.cc }} - CXX: ${{ matrix.cxx }} - run: | - cd $HOME - git clone https://github.com/doxygen/doxygen.git - cd doxygen - git checkout Release_1_12_0 - mkdir build - cd build - cmake .. -Duse_libclang=ON -Duse_libc++=OFF - make -j 2 VERBOSE=1 - cp bin/doxygen /usr/local/bin/doxygen + echo "PYTHONPATH=$(brew --prefix llvm)/lib/python3.13/site-packages" >> $GITHUB_ENV - name: Add clang CXXFLAGS if: ${{ contains(matrix.cxx, 'clang') }}