mirror of
https://github.com/NGSolve/netgen.git
synced 2025-03-03 08:25:40 +05:00
gitlab-ci: adapt settings for new runner
This commit is contained in:
parent
e0e856f7c0
commit
b0117c9639
@ -17,10 +17,11 @@ stages:
|
||||
- "echo off"
|
||||
- 'call "%VS140COMNTOOLS%\..\..\VC\bin\vcvars32.bat"'
|
||||
- set CMAKE_GENERATOR=Visual Studio 14 2015
|
||||
- set INSTALL_DIR=C:/install32_%CI_BUILD_REF_NAME%/
|
||||
- set NETGENDIR=C:\install32_%CI_BUILD_REF_NAME%\bin
|
||||
- set PYTHONPATH=C:\install32_%CI_BUILD_REF_NAME%\lib\site-packages
|
||||
- set PYTHON_CONFIG=-DPYTHON_LIBRARIES=C:/Python3.5_32/libs/python35.lib -DPYTHON_INCLUDE_DIRS=C:/Python3.5_32/include -DPYTHON_EXECUTABLE=C:/Python3.5_32/python.exe
|
||||
- set CI_DIR=C:\ci\%CI_BUILD_REF%_32
|
||||
- set NETGEN_BUILD_DIR=%CI_DIR%\build
|
||||
- set INSTALL_DIR=%CI_DIR%\install
|
||||
- set NETGENDIR=%INSTALL_DIR%\bin
|
||||
- set PYTHONPATH=%INSTALL_DIR%\lib\site-packages
|
||||
|
||||
.template_windows_64: &win64
|
||||
tags:
|
||||
@ -30,11 +31,11 @@ stages:
|
||||
- "echo off"
|
||||
- 'call "%VS140COMNTOOLS%\..\..\VC\bin\amd64\vcvars64.bat"'
|
||||
- set CMAKE_GENERATOR=Visual Studio 14 2015 Win64
|
||||
- set INSTALL_DIR=C:/install64_%CI_BUILD_REF_NAME%/
|
||||
- set NETGENDIR=C:\install64_%CI_BUILD_REF_NAME%\bin
|
||||
- set PYTHONPATH=C:\install64_%CI_BUILD_REF_NAME%\lib\site-packages
|
||||
- set PYTHON_LIB=C:/Python3.5/libs/python35.lib
|
||||
- set PYTHON_CONFIG=-DPYTHON_LIBRARIES=C:/Python3.5/libs/python35.lib -DPYTHON_INCLUDE_DIRS=C:/Python3.5/include -DPYTHON_EXECUTABLE=C:/Python3.5/python.exe
|
||||
- set CI_DIR=C:\ci\%CI_BUILD_REF%_64
|
||||
- set NETGEN_BUILD_DIR=%CI_DIR%\build
|
||||
- set INSTALL_DIR=%CI_DIR%\install
|
||||
- set NETGENDIR=%INSTALL_DIR%\bin
|
||||
- set PYTHONPATH=%INSTALL_DIR%\lib\site-packages
|
||||
|
||||
# Linux
|
||||
.template_ubuntu: &ubuntu
|
||||
@ -63,15 +64,14 @@ stages:
|
||||
.template_build_win: &tbuild_netgen_win
|
||||
stage: build
|
||||
script:
|
||||
- if not exist build MKDIR build
|
||||
- cd build
|
||||
- DEL CMakeCache.txt
|
||||
- RD /S /Q CMakeFiles
|
||||
- git submodule update --init --recursive
|
||||
- rd /s /q %NETGEN_BUILD_DIR%
|
||||
- mkdir %NETGEN_BUILD_DIR%
|
||||
- cd %NETGEN_BUILD_DIR%
|
||||
- >-
|
||||
cmake ..\
|
||||
%PYTHON_CONFIG%
|
||||
cmake %CI_PROJECT_DIR%
|
||||
-G"%CMAKE_GENERATOR%"
|
||||
-DINSTALL_DIR="%INSTALL_DIR%"
|
||||
-DINSTALL_DIR=%INSTALL_DIR%
|
||||
-DUSE_OCC=ON
|
||||
-DCMAKE_BUILD_TYPE=Release
|
||||
- cmake --build . --target INSTALL --config Release
|
||||
@ -118,31 +118,21 @@ build_ubuntu_1604:
|
||||
############################################
|
||||
|
||||
# Windows
|
||||
.template_test_win: &ttest_netgen_win
|
||||
.template_test_win: &test_win
|
||||
stage: test
|
||||
script:
|
||||
- cd build
|
||||
- cd netgen
|
||||
- cd %NETGEN_BUILD_DIR%/netgen
|
||||
- ctest -C Release -V
|
||||
- cd ..
|
||||
|
||||
# skip since we have no machine with 32 bits
|
||||
.test_netgen_win32:
|
||||
test_win32:
|
||||
<<: *win32
|
||||
<<: *ttest_netgen_win
|
||||
cache:
|
||||
paths:
|
||||
- build/
|
||||
- src/
|
||||
key: "netgen_win32_${CI_BUILD_REF_NAME}"
|
||||
<<: *test_win
|
||||
|
||||
test_netgen_win64:
|
||||
test_win64:
|
||||
<<: *win64
|
||||
<<: *ttest_netgen_win
|
||||
cache:
|
||||
paths:
|
||||
- build/
|
||||
- src/
|
||||
key: "netgen_win64_${CI_BUILD_REF_NAME}"
|
||||
<<: *test_win
|
||||
|
||||
# Linux
|
||||
.template_test_linux: &test_linux
|
||||
@ -176,3 +166,27 @@ linux_cleanup:
|
||||
when: always
|
||||
allow_failure: true
|
||||
|
||||
win64_cleanup:
|
||||
<<: *win64
|
||||
stage: cleanup
|
||||
tags:
|
||||
- windows
|
||||
- x64
|
||||
script:
|
||||
- cd %CI_PROJECT_DIR%
|
||||
- rd /s /q %CI_DIR%
|
||||
when: always
|
||||
allow_failure: true
|
||||
|
||||
win32_cleanup:
|
||||
<<: *win32
|
||||
stage: cleanup
|
||||
tags:
|
||||
- windows
|
||||
- x86
|
||||
script:
|
||||
- cd %CI_PROJECT_DIR%
|
||||
- rd /s /q %CI_DIR%
|
||||
when: always
|
||||
allow_failure: true
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user