From de4d835be3eebc5edf74ab2754dd08b4dac57f2f Mon Sep 17 00:00:00 2001
From: Olivier BICHLER <olivier.bichler@cea.fr>
Date: Tue, 29 Aug 2023 18:31:19 +0200
Subject: [PATCH] Fixed install and added test for Windows
---
.gitlab/ci/build.gitlab-ci.yml | 7 ++++++-
.gitlab/ci/test.gitlab-ci.yml | 12 ++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml
index 3d5b1fe33..c9e4771b8 100644
--- a/.gitlab/ci/build.gitlab-ci.yml
+++ b/.gitlab/ci/build.gitlab-ci.yml
@@ -54,4 +54,9 @@ build:windows_cpp:
- cd build_cpp
- cmake -DCMAKE_INSTALL_PREFIX:PATH=../install_cpp -DCMAKE_BUILD_TYPE=Debug ..
- cmake --build . -j2
- - cmake --install ../install_cpp
+ - cmake --install .
+
+ artifacts:
+ paths:
+ - build_cpp/
+ - install_cpp/
diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml
index 25ddfca3d..371955964 100644
--- a/.gitlab/ci/test.gitlab-ci.yml
+++ b/.gitlab/ci/test.gitlab-ci.yml
@@ -25,3 +25,15 @@ test:ubuntu_python:
artifacts:
reports:
junit: aidge_core/xmlrunner-results.xml
+
+test:windows_cpp:
+ stage: test
+ needs: ["build:windows_cpp"]
+ tags:
+ - windows
+ script:
+ - cd build_cpp
+ - ctest --output-junit ctest-results.xml --output-on-failure
+ artifacts:
+ reports:
+ junit: build_cpp/ctest-results.xml
--
GitLab