diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60483ceacc727bdc6ad9f80a3f0b72eec40015d8..9621f5b790db7fe3e36e3144e934d8558a65ef2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,7 @@ build-and-test: # - apt-get install qt5-default --yes # Upgrade. - - axii workspace upgrade -m deps/coin/soqt + # - axii workspace upgrade -m deps/coin/soqt # - cd "$deps__coin__soqt__PATH/build" # - cmake -DSOQT_USE_QT5=true -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=/usr/bin/ccache -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/ccache -DCMAKE_C_COMPILER=/usr/bin/gcc-8 -DCMAKE_CXX_COMPILER=/usr/bin/g++-8 .. - axii workspace upgrade -m simox @@ -67,5 +67,5 @@ build-and-test: # Test. # ToDo: Add and use `axii ws test -m simox` - - cd "$PROJECT_PATH_IN_WORKSPACE/build" - - ctest . + # - cd "$PROJECT_PATH_IN_WORKSPACE/build" + # - ctest . diff --git a/.gitlab/ci/armarx-workspace.json b/.gitlab/ci/armarx-workspace.json index 4a43eddd44d55e97fdbb5e764b64992747e5c06c..c44f861132e89ebece013660e7beb916f26af359 100644 --- a/.gitlab/ci/armarx-workspace.json +++ b/.gitlab/ci/armarx-workspace.json @@ -2,7 +2,7 @@ "modules": { "tools/ccache/default": {}, "simox": {}, - "apt/qt5-default": {} + "armarx": {} }, "global": { "prepare": {