From 26b5ec92ca21b2ce110b49835138f9224b035c88 Mon Sep 17 00:00:00 2001 From: Brad Whitlock Date: Tue, 8 Oct 2024 11:38:13 -0700 Subject: [PATCH 1/4] Fix line numbers --- src/docs/sphinx/quickstart_guide/zero_to_axom.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/docs/sphinx/quickstart_guide/zero_to_axom.rst b/src/docs/sphinx/quickstart_guide/zero_to_axom.rst index 15f58ecb23..ef89caa2fd 100644 --- a/src/docs/sphinx/quickstart_guide/zero_to_axom.rst +++ b/src/docs/sphinx/quickstart_guide/zero_to_axom.rst @@ -109,7 +109,7 @@ CMake-based build system example .. literalinclude:: ../../../examples/using-with-cmake/CMakeLists.txt :language: cmake - :lines: 27-50 + :lines: 33-87 See: ``examples/axom/using-with-cmake`` @@ -119,7 +119,7 @@ BLT-based build system example .. literalinclude:: ../../../examples/using-with-blt/CMakeLists.txt :language: cmake - :lines: 31-61 + :lines: 31-62 See: ``examples/axom/using-with-blt`` From bab8996a148d4c06bb895f5144777be7328f9a28 Mon Sep 17 00:00:00 2001 From: Brad Whitlock Date: Tue, 8 Oct 2024 12:56:09 -0700 Subject: [PATCH 2/4] Change line numbers to tags. --- src/docs/sphinx/quickstart_guide/zero_to_axom.rst | 9 ++++++--- src/examples/using-with-blt/CMakeLists.txt | 4 ++-- src/examples/using-with-cmake/CMakeLists.txt | 2 ++ src/examples/using-with-make/Makefile.in | 2 ++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/docs/sphinx/quickstart_guide/zero_to_axom.rst b/src/docs/sphinx/quickstart_guide/zero_to_axom.rst index ef89caa2fd..b8d8c8ed64 100644 --- a/src/docs/sphinx/quickstart_guide/zero_to_axom.rst +++ b/src/docs/sphinx/quickstart_guide/zero_to_axom.rst @@ -109,7 +109,8 @@ CMake-based build system example .. literalinclude:: ../../../examples/using-with-cmake/CMakeLists.txt :language: cmake - :lines: 33-87 + :start-after: _zerotoaxom_docs_start + :end-before: _zerotoaxom_docs_end See: ``examples/axom/using-with-cmake`` @@ -119,7 +120,8 @@ BLT-based build system example .. literalinclude:: ../../../examples/using-with-blt/CMakeLists.txt :language: cmake - :lines: 31-62 + :start-after: _zerotoaxom_docs_start + :end-before: _zerotoaxom_docs_end See: ``examples/axom/using-with-blt`` @@ -129,6 +131,7 @@ Makefile-based build system example .. literalinclude:: ../../../examples/using-with-make/Makefile.in :language: make - :lines: 28-39 + :start-after: _zerotoaxom_docs_start + :end-before: _zerotoaxom_docs_end See: ``examples/axom/using-with-make`` diff --git a/src/examples/using-with-blt/CMakeLists.txt b/src/examples/using-with-blt/CMakeLists.txt index 8a1846f203..61e5a6e955 100644 --- a/src/examples/using-with-blt/CMakeLists.txt +++ b/src/examples/using-with-blt/CMakeLists.txt @@ -27,7 +27,7 @@ project(using_with_blt) # Define some config options option(EXAMPLE_VERBOSE_OUTPUT "Verbose output about imported targets" OFF) - +# _zerotoaxom_docs_start #------------------------------------------------------------------------------ # Set up BLT with validity checks #------------------------------------------------------------------------------ @@ -60,7 +60,7 @@ find_dependency(axom REQUIRED blt_add_executable(NAME example SOURCES example.cpp DEPENDS_ON axom axom::fmt) - +# _zerotoaxom_docs_end #------------------------------------------------------------------------------ # Optionally, print out information about imported targets diff --git a/src/examples/using-with-cmake/CMakeLists.txt b/src/examples/using-with-cmake/CMakeLists.txt index 63eeca1150..d618a58b57 100644 --- a/src/examples/using-with-cmake/CMakeLists.txt +++ b/src/examples/using-with-cmake/CMakeLists.txt @@ -30,6 +30,7 @@ project(using_with_cmake) message(STATUS "CMake Version: ${CMAKE_VERSION}") +# _zerotoaxom_docs_start #------------------------------------------------------------------------------ # Check for AXOM_DIR and use CMake's find_package to import axom's targets #------------------------------------------------------------------------------ @@ -85,3 +86,4 @@ target_include_directories(example PRIVATE ${AXOM_INCLUDE_DIRS}) # link to axom targets target_link_libraries(example axom) target_link_libraries(example axom::fmt) +# _zerotoaxom_docs_end diff --git a/src/examples/using-with-make/Makefile.in b/src/examples/using-with-make/Makefile.in index dc754c6281..c4261001fd 100644 --- a/src/examples/using-with-make/Makefile.in +++ b/src/examples/using-with-make/Makefile.in @@ -25,6 +25,7 @@ # and linking flags. #------------------------------------------------------------------------------ +# _zerotoaxom_docs_start AXOM_DIR ?= ../../.. CXX=@CMAKE_CXX_COMPILER@ @@ -37,3 +38,4 @@ main: clean: rm -f example +# _zerotoaxom_docs_end From baa5646104a2b476d3a2bf8418e82cb61167f9b6 Mon Sep 17 00:00:00 2001 From: Brad Whitlock Date: Tue, 8 Oct 2024 16:01:01 -0700 Subject: [PATCH 3/4] Try increasing Azure timeoutInMinutes limit. --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b5cdc6bfb8..b5676490e2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,6 +16,8 @@ variables: jobs: - job: Build_and_Test + timeoutInMinutes: 120 + strategy: matrix: linux_gcc13: From 8dbc8e26776f702ba0933aa19a771e9861ff15eb Mon Sep 17 00:00:00 2001 From: Brad Whitlock Date: Tue, 8 Oct 2024 17:57:31 -0700 Subject: [PATCH 4/4] Reduce timeout - does it interfere with scheduling? --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b5676490e2..41c2157068 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,7 +16,7 @@ variables: jobs: - job: Build_and_Test - timeoutInMinutes: 120 + timeoutInMinutes: 90 strategy: matrix: