diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml index 18963ced1084c56c1e4c04dceec735126bba962a..39d5a378b7ed94b0455ad5cd36464b180c52c535 100644 --- a/.gitlab/ci/build.gitlab-ci.yml +++ b/.gitlab/ci/build.gitlab-ci.yml @@ -143,72 +143,72 @@ build:ubuntu_python: paths: - venv/ -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 - # Update PATH - - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") - script: - # Download dependencies - # aidge_core - - $DEPENDENCY_NAME="aidge_core" - - $DEPENDENCY_JOB="build:windows_cpp" - - !reference [.download_dependency_windows, script] - - Remove-Item .\build_cpp\ -Recurse -Force -ErrorAction Ignore - - - $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: - expire_in: 1 week - paths: - - build_cpp/ - - install_cpp/ - -build:windows_python: - 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 - # Update PATH - - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") - script: - # Download dependencies - # aidge_core (Python) - - $DEPENDENCY_NAME="aidge_core" - - $DEPENDENCY_JOB="build:windows_python" - - !reference [.download_dependency_windows, script] - - - python -m pip install virtualenv - - virtualenv venv - - venv\Scripts\Activate.ps1 - - python -m pip install -r requirements.txt - - python -m pip install . - artifacts: - expire_in: 1 week - paths: - - venv/ +# 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 +# # Update PATH +# - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") +# script: +# # Download dependencies +# # aidge_core +# - $DEPENDENCY_NAME="aidge_core" +# - $DEPENDENCY_JOB="build:windows_cpp" +# - !reference [.download_dependency_windows, script] +# - Remove-Item .\build_cpp\ -Recurse -Force -ErrorAction Ignore + +# - $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: +# expire_in: 1 week +# paths: +# - build_cpp/ +# - install_cpp/ + +# build:windows_python: +# 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 +# # Update PATH +# - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") +# script: +# # Download dependencies +# # aidge_core (Python) +# - $DEPENDENCY_NAME="aidge_core" +# - $DEPENDENCY_JOB="build:windows_python" +# - !reference [.download_dependency_windows, script] + +# - python -m pip install virtualenv +# - virtualenv venv +# - venv\Scripts\Activate.ps1 +# - python -m pip install -r requirements.txt +# - python -m pip install . +# artifacts: +# expire_in: 1 week +# paths: +# - venv/ diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 3cada635eb25b3eb87e8318eb6e26723f7a27dd6..d0c94c2a3bcbb2908863b15b2b52ef068a55ff94 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -26,23 +26,23 @@ test:ubuntu_python: 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