From cc0c18aaeadccccd801b38c321767ad9515bb38f Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 22 Dec 2022 17:43:22 +0100
Subject: [PATCH] Re add armarx, remove testing
---
.gitlab-ci.yml | 6 +++---
.gitlab/ci/armarx-workspace.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60483ceac..9621f5b79 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 4a43eddd4..c44f86113 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": {
--
GitLab