Skip to content

Commit 815ceba

Browse files
committed
integrate compiler explorer with Nabla CMake build system, update docker/compiler-explorer submodule
1 parent f88fa6c commit 815ceba

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

tools/nsc/CMakeLists.txt

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ services:
126126
- type: bind
127127
source: .\install
128128
target: @NBL_DOCKER_CT_NSC_VOLUME_TARGET@
129+
read_only: true
129130
- type: bind
130131
source: @MSVC_REDIST_DIR@
131132
target: C:\redist
@@ -147,11 +148,22 @@ file(WRITE "${NBL_DOCKER_CE_COMPOSE_TARGET}" "${COMPOSE_CONTENT}")
147148
add_custom_target(run-compiler-explorer
148149
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --blue "Performing Pre-Test..."
149150
COMMAND ctest -C $<CONFIG> --stop-on-failure
150-
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --yellow "Attempt to remove any remaining previous container..."
151-
COMMAND docker compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" rm -f
151+
COMMAND docker compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" down
152152
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --green "Starting Compiler Explorer!"
153-
COMMAND docker compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" up --build compiler-explorer-nsc
153+
COMMAND docker compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" up --build -d compiler-explorer-nsc
154+
COMMAND docker compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" exec compiler-explorer-nsc cmd /c python ce_healthy_check.py --interval 10 --ticks 25
155+
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --green "Compiler Explorer is running, type \"localhost\" in your browser!"
154156
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
157+
VERBATIM
158+
USES_TERMINAL
159+
)
160+
161+
add_custom_target(is-compiler-explorer-running
162+
COMMAND docker compose -f "${NBL_DOCKER_CE_COMPOSE_TARGET}" exec compiler-explorer-nsc cmd /c python ce_healthy_check.py --ticks 1
163+
VERBATIM
164+
USES_TERMINAL
155165
)
166+
156167
add_dependencies(run-compiler-explorer nsc)
157-
set_target_properties(run-compiler-explorer PROPERTIES FOLDER "Utilities")
168+
set_target_properties(run-compiler-explorer PROPERTIES FOLDER "Godbolt")
169+
set_target_properties(is-compiler-explorer-running PROPERTIES FOLDER "Godbolt")

0 commit comments

Comments
 (0)