Skip to content

Commit

Permalink
Merge pull request #533 from LLNL/hotfix/rtd_failure
Browse files Browse the repository at this point in the history
Pin docutils version to fix RTD build
  • Loading branch information
white238 authored Oct 27, 2021
2 parents 0a98919 + 2cc41b9 commit a3befa1
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 30 deletions.
11 changes: 11 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Optionally set the version of Python and requirements required to build your docs
python:
install:
- requirements: docs/requirements.txt
40 changes: 10 additions & 30 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,26 @@ variables:

strategy:
matrix:
linux_gcc7:
VM_ImageName: 'ubuntu-16.04'
Compiler_ImageName: 'axom/tpls:gcc-7'
C_COMPILER: '/usr/bin/gcc'
CXX_COMPILER: '/usr/bin/g++'
CMAKE_BIN_DIR: '/home/axom/axom_tpls/gcc-7.3.0/cmake-3.9.6/bin'
MPI_DIR: '/home/axom/axom_tpls/gcc-7.3.0/mpich-3.2.1'
MPI_FLAGS: '-DENABLE_MPI=ON -DMPI_C_COMPILER=$(MPI_DIR)/bin/mpicc -DMPI_CXX_COMPILER=$(MPI_DIR)/bin/mpicxx -DMPIEXEC=$(MPI_DIR)/bin/mpiexec -DMPIEXEC_NUMPROC_FLAG=-n'
CMAKE_FLAGS: '-DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DENABLE_GTEST_DEATH_TESTS=OFF $(MPI_FLAGS) -DENABLE_OPENMP=ON'
TEST_TARGET: 'linux_gcc7'
linux_gcc8:
VM_ImageName: 'ubuntu-16.04'
Compiler_ImageName: 'axom/tpls:gcc-8'
VM_ImageName: 'ubuntu-20.04'
Compiler_ImageName: 'axom/tpls:gcc-8_10-21-21_21h-28m'
C_COMPILER: '/usr/bin/gcc'
CXX_COMPILER: '/usr/bin/g++'
CMAKE_BIN_DIR: '/home/axom/axom_tpls/gcc-8.1.0/cmake-3.10.1/bin'
MPI_DIR: '/home/axom/axom_tpls/gcc-8.1.0/mpich-3.3.2'
CMAKE_BIN_DIR: '/usr/bin'
MPI_DIR: '/usr'
MPI_FLAGS: '-DENABLE_MPI=ON -DMPI_C_COMPILER=$(MPI_DIR)/bin/mpicc -DMPI_CXX_COMPILER=$(MPI_DIR)/bin/mpicxx -DMPIEXEC=$(MPI_DIR)/bin/mpiexec -DMPIEXEC_NUMPROC_FLAG=-n'
CMAKE_FLAGS: '-DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DENABLE_GTEST_DEATH_TESTS=OFF $(MPI_FLAGS) -DENABLE_OPENMP=ON'
TEST_TARGET: 'linux_gcc8'
linux_clang4:
VM_ImageName: 'ubuntu-16.04'
Compiler_ImageName: 'axom/tpls:clang-4'
C_COMPILER: '/usr/bin/clang'
CXX_COMPILER: '/usr/bin/clang++'
CMAKE_BIN_DIR: '/home/axom/axom_tpls/clang-4.0.0/cmake-3.10.1/bin'
MPI_DIR: '/home/axom/axom_tpls/clang-4.0.0/mpich-3.0.4'
MPI_FLAGS: '-DENABLE_MPI=ON -DMPI_C_COMPILER=$(MPI_DIR)/bin/mpicc -DMPI_CXX_COMPILER=$(MPI_DIR)/bin/mpicxx -DMPIEXEC=$(MPI_DIR)/bin/mpiexec -DMPIEXEC_NUMPROC_FLAG=-n'
CMAKE_FLAGS: '-DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DENABLE_GTEST_DEATH_TESTS=OFF $(MPI_FLAGS) -DENABLE_OPENMP=ON'
TEST_TARGET: 'linux_clang4'
linux_clang6:
VM_ImageName: 'ubuntu-16.04'
Compiler_ImageName: 'axom/tpls:clang-6'
linux_clang10:
VM_ImageName: 'ubuntu-18.04'
Compiler_ImageName: 'axom/tpls:clang-10_10-21-21_21h-28m'
C_COMPILER: '/usr/bin/clang'
CXX_COMPILER: '/usr/bin/clang++'
CMAKE_BIN_DIR: '/home/axom/axom_tpls/clang-6.0.0/cmake-3.10.1/bin'
MPI_DIR: '/home/axom/axom_tpls/clang-6.0.0/mpich-3.0.4'
CMAKE_BIN_DIR: '/usr/bin'
MPI_DIR: '/usr'
MPI_FLAGS: '-DENABLE_MPI=ON -DMPI_C_COMPILER=$(MPI_DIR)/bin/mpicc -DMPI_CXX_COMPILER=$(MPI_DIR)/bin/mpicxx -DMPIEXEC=$(MPI_DIR)/bin/mpiexec -DMPIEXEC_NUMPROC_FLAG=-n'
CMAKE_FLAGS: '-DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) -DENABLE_GTEST_DEATH_TESTS=OFF $(MPI_FLAGS) -DENABLE_OPENMP=ON'
TEST_TARGET: 'linux_clang6'
TEST_TARGET: 'linux_clang10'
osx_gcc:
VM_ImageName: 'macos-10.14'
CMAKE_FLAGS: ''
Expand Down
1 change: 1 addition & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docutils<0.18

0 comments on commit a3befa1

Please sign in to comment.