diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fad8a795a8819ea4ea98a954e13c64bb6f4fc683..0385bdba7868171455a86370c1855d931e690d32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,6 +119,9 @@ windows:build: tags: - windows + needs: [] + dependencies: [] + cache: # use artifacts instead if multiple runners available key: $CI_COMMIT_SHORT_SHA paths: @@ -136,7 +139,7 @@ windows:build: windows:test: only: - - master + - main - merge_requests stage: test diff --git a/CMakeLists.txt b/CMakeLists.txt index aea9e94c9e7283a719c0a4c54892e952c452069b..1a39fa40970060ece8fa847b2b92ca5be2648100 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,7 @@ configure_file(${CMAKE_SOURCE_DIR}/src/config.cpp.in if (WIN32) # TODO(nick) Should do based upon compiler (VS) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${VS_STARTUP_PROJECT}) - set_property(TARGET voltu-node PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${VS_DEBUG_WORKING_DIRECTORY}) + #set_property(TARGET voltu-node PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${VS_DEBUG_WORKING_DIRECTORY}) endif() #include(ftl_CPack)