diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml index a113e66370c87658c19aec68f18b3d35722b9752..3431d2d013c565c1b0618bbbe50d9d32c407fdcf 100644 --- a/.gitlab/ci/build.gitlab-ci.yml +++ b/.gitlab/ci/build.gitlab-ci.yml @@ -58,42 +58,42 @@ build:ubuntu_python: paths: - venv/ -build:windows_cpp: - stage: build - needs: [] - tags: - - windows +# build:windows_cpp: +# stage: build +# needs: [] +# tags: +# - windows - image: buildtools - before_script: - # Install Chocolatey - - Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) - # Install dependencies - - choco install cmake.install --installargs '"ADD_CMAKE_TO_PATH=System"' -Y - - choco install git -Y - - choco install python -Y - - choco install cuda -Y - # Update PATH - - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") - script: - # Download dependencies - # aidge_core - - 'curl "https://gitlab.eclipse.org/api/v4/projects/5139/jobs/artifacts/main/download?job=build:windows_cpp" -o build_artifacts.zip' - - Expand-Archive -Path .\build_artifacts.zip -DestinationPath . -Force - - Remove-Item .\build_cpp\ -Recurse - # aidge_backend_cpu - - 'curl "https://gitlab.eclipse.org/api/v4/projects/5140/jobs/artifacts/master/download?job=build:windows_cpp" -o build_artifacts.zip' - - Expand-Archive -Path .\build_artifacts.zip -DestinationPath . -Force - - Remove-Item .\build_cpp\ -Recurse +# image: buildtools +# before_script: +# # Install Chocolatey +# - Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) +# # Install dependencies +# - choco install cmake.install --installargs '"ADD_CMAKE_TO_PATH=System"' -Y +# - choco install git -Y +# - choco install python -Y +# - choco install cuda -Y +# # Update PATH +# - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") +# script: +# # Download dependencies +# # aidge_core +# - 'curl "https://gitlab.eclipse.org/api/v4/projects/5139/jobs/artifacts/main/download?job=build:windows_cpp" -o build_artifacts.zip' +# - Expand-Archive -Path .\build_artifacts.zip -DestinationPath . -Force +# - Remove-Item .\build_cpp\ -Recurse +# # aidge_backend_cpu +# - 'curl "https://gitlab.eclipse.org/api/v4/projects/5140/jobs/artifacts/master/download?job=build:windows_cpp" -o build_artifacts.zip' +# - Expand-Archive -Path .\build_artifacts.zip -DestinationPath . -Force +# - Remove-Item .\build_cpp\ -Recurse - - $env:CMAKE_PREFIX_PATH = '../install_cpp' - - mkdir -p build_cpp - - cd build_cpp - - cmake -DCMAKE_INSTALL_PREFIX:PATH=../install_cpp -DCMAKE_BUILD_TYPE=Debug .. - - cmake --build . -j2 - - cmake --install . --config Debug +# - $env:CMAKE_PREFIX_PATH = '../install_cpp' +# - mkdir -p build_cpp +# - cd build_cpp +# - cmake -DCMAKE_INSTALL_PREFIX:PATH=../install_cpp -DCMAKE_BUILD_TYPE=Debug .. +# - cmake --build . -j2 +# - cmake --install . --config Debug - artifacts: - paths: - - build_cpp/ - - install_cpp/ +# artifacts: +# paths: +# - build_cpp/ +# - install_cpp/ diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 5245c850b9c012ae682e6f7f760c3e85bb11e165..d50633dc5bdc3dff4fd7c849e3bce4ef64af25b9 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -10,39 +10,39 @@ test:ubuntu_cpp: reports: junit: build_cpp/ctest-results.xml -test:ubuntu_python: - stage: test - needs: ["build:ubuntu_python"] - tags: - - docker - script: - - source venv/bin/activate - - cd ${CI_PROJECT_NAME} - - python3 -m pip install numpy unittest-xml-reporting - - python3 -m pip list - # Run on discovery all tests located in core/unit_tests/python - - python3 -m xmlrunner discover -s unit_tests/ -v -b --output-file xmlrunner-results.xml - artifacts: - reports: - junit: ${CI_PROJECT_NAME}/xmlrunner-results.xml +# test:ubuntu_python: +# stage: test +# needs: ["build:ubuntu_python"] +# tags: +# - docker +# script: +# - source venv/bin/activate +# - cd ${CI_PROJECT_NAME} +# - python3 -m pip install numpy unittest-xml-reporting +# - python3 -m pip list +# # Run on discovery all tests located in core/unit_tests/python +# - python3 -m xmlrunner discover -s unit_tests/ -v -b --output-file xmlrunner-results.xml +# artifacts: +# reports: +# junit: ${CI_PROJECT_NAME}/xmlrunner-results.xml -test:windows_cpp: - stage: test - needs: ["build:windows_cpp"] - tags: - - windows - image: buildtools - before_script: - # Install Chocolatey - - Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) - # Install dependencies - - choco install cmake.install --installargs '"ADD_CMAKE_TO_PATH=System"' -Y - - choco install python -Y - # Update PATH - - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") - script: - - cd build_cpp - - ctest --output-junit ctest-results.xml --output-on-failure - artifacts: - reports: - junit: build_cpp/ctest-results.xml +# test:windows_cpp: +# stage: test +# needs: ["build:windows_cpp"] +# tags: +# - windows +# image: buildtools +# before_script: +# # Install Chocolatey +# - Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) +# # Install dependencies +# - choco install cmake.install --installargs '"ADD_CMAKE_TO_PATH=System"' -Y +# - choco install python -Y +# # Update PATH +# - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") +# script: +# - cd build_cpp +# - ctest --output-junit ctest-results.xml --output-on-failure +# artifacts: +# reports: +# junit: build_cpp/ctest-results.xml