Skip to content
Snippets Groups Projects
Commit f6fe3c9f authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

Mac,Win: retry concat

parent 5704d037
No related branches found
No related tags found
1 merge request!773new mechanism to steer simulation size in examples and tests, based on command-line argument sim_n
...@@ -10,10 +10,8 @@ native_Debian_clang: ...@@ -10,10 +10,8 @@ native_Debian_clang:
- clang --version - clang --version
stage: build stage: build
script: &native_scr script: &native_scr
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib
- echo PYTHONPATH_FOLLOWS
- echo $PYTHONPATH
- pwd - pwd
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_PY_PACKAGE=ON #-DWERROR=ON - cmake .. -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_PY_PACKAGE=ON #-DWERROR=ON
...@@ -32,8 +30,10 @@ mac10_15: ...@@ -32,8 +30,10 @@ mac10_15:
- macbuild3 - macbuild3
stage: build stage: build
script: script:
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib - echo PYTHONPATH1_FOLLOWS
- echo PYTHONPATH_FOLLOWS - echo $PYTHONPATH
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib:$PYTHONPATH
- echo PYTHONPATH2_FOLLOWS
- echo $PYTHONPATH - echo $PYTHONPATH
- mkdir build - mkdir build
- cd build - cd build
...@@ -54,8 +54,10 @@ mac12_2: ...@@ -54,8 +54,10 @@ mac12_2:
- scgmac4 - scgmac4
stage: build stage: build
script: script:
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib - echo PYTHONPATH1_FOLLOWS
- echo PYTHONPATH_FOLLOWS - echo $PYTHONPATH
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib:$PYTHONPATH
- echo PYTHONPATH2_FOLLOWS
- echo $PYTHONPATH - echo $PYTHONPATH
- mkdir build - mkdir build
- cd build - cd build
...@@ -94,9 +96,11 @@ windows: ...@@ -94,9 +96,11 @@ windows:
- $QT_MSVC_DIR = "C:/Qt/msvc" - $QT_MSVC_DIR = "C:/Qt/msvc"
- $QTCMake_DIR = "$QT_MSVC_DIR/lib/cmake" - $QTCMake_DIR = "$QT_MSVC_DIR/lib/cmake"
- $BUILD_DIR = "build" - $BUILD_DIR = "build"
- echo PYTHONPATH1_FOLLOWS
- echo "# Pythonpath1 <$Env:PYTHONPATH>"
- $PYTHONPATH="$CI_PROJECT_DIR/build/lib:$PYTHONPATH" - $PYTHONPATH="$CI_PROJECT_DIR/build/lib:$PYTHONPATH"
- echo PYTHONPATH_FOLLOWS - echo PYTHONPATH2_FOLLOWS
- echo "# Pythonpath <$Env:PYTHONPATH>" - echo "# Pythonpath2 <$Env:PYTHONPATH>"
# list powershell properties # list powershell properties
- echo "# Path <$Env:Path>" - echo "# Path <$Env:Path>"
- echo "# Powershell <$PSHOME>`n PS Profile <$PROFILE>`n PS Command-Path <$PSCOMMANDPATH>" - echo "# Powershell <$PSHOME>`n PS Profile <$PROFILE>`n PS Command-Path <$PSCOMMANDPATH>"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment