From 4e53d9497fcc02db1372a0c4248fd3217e22ca62 Mon Sep 17 00:00:00 2001
From: Olivier BICHLER <olivier.bichler@cea.fr>
Date: Fri, 13 Oct 2023 09:12:07 +0000
Subject: [PATCH] Wrong gitlab runner for windows_python
---
.gitlab/ci/build.gitlab-ci.yml | 22 ++++++++++++++++------
setup.py | 4 ++--
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml
index 62878a57d..6bfae0be1 100644
--- a/.gitlab/ci/build.gitlab-ci.yml
+++ b/.gitlab/ci/build.gitlab-ci.yml
@@ -130,16 +130,26 @@ build:windows_python:
stage: build
needs: []
tags:
- - docker
+ - 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:
- - python3 -m pip install virtualenv
+ - python -m pip install virtualenv
- virtualenv venv
- - source venv/bin/activate
+ - venv\Scripts\Activate.ps1
# Numpy dependancy for unit test
- - python3 -m pip install numpy
- - export AIDGE_INSTALL=`pwd`/install
- - python3 -m pip install .
+ - python -m pip install numpy
+ - $env:AIDGE_INSTALL = "$pwd" + "install"
+ - python -m pip install .
artifacts:
expire_in: 1 week
paths:
diff --git a/setup.py b/setup.py
index 4611ac78a..b88329e54 100644
--- a/setup.py
+++ b/setup.py
@@ -70,8 +70,8 @@ class CMakeBuild(build_ext):
self.spawn(['cmake', str(cwd), param_py, '-DTEST=OFF', f'-DCMAKE_INSTALL_PREFIX:PATH={install_path}'])
if not self.dry_run:
- self.spawn(['cmake', '--build', '.', '-j', max_jobs])
- self.spawn(['cmake', '--install', '.'])
+ self.spawn(['cmake', '--build', '.', '--config', 'Debug', '-j', max_jobs])
+ self.spawn(['cmake', '--install', '.', '--config', 'Debug'])
os.chdir(str(cwd))
aidge_package = build_lib / (get_project_name())
--
GitLab