From f6fe3c9f04757f03bb918cf4efafef1cef86456c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 10 Apr 2022 18:50:50 +0200
Subject: [PATCH] Mac,Win: retry concat
---
.gitlab-ci.yml | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07b9228212c..f1570aa9711 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,10 +10,8 @@ native_Debian_clang:
- clang --version
stage: build
script: &native_scr
- - export PYTHONPATH=$CI_PROJECT_DIR/build/lib
- - echo PYTHONPATH_FOLLOWS
- - echo $PYTHONPATH
- pwd
+ - export PYTHONPATH=$CI_PROJECT_DIR/build/lib
- mkdir build
- cd build
- cmake .. -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_PY_PACKAGE=ON #-DWERROR=ON
@@ -32,8 +30,10 @@ mac10_15:
- macbuild3
stage: build
script:
- - export PYTHONPATH=$CI_PROJECT_DIR/build/lib
- - echo PYTHONPATH_FOLLOWS
+ - echo PYTHONPATH1_FOLLOWS
+ - echo $PYTHONPATH
+ - export PYTHONPATH=$CI_PROJECT_DIR/build/lib:$PYTHONPATH
+ - echo PYTHONPATH2_FOLLOWS
- echo $PYTHONPATH
- mkdir build
- cd build
@@ -54,8 +54,10 @@ mac12_2:
- scgmac4
stage: build
script:
- - export PYTHONPATH=$CI_PROJECT_DIR/build/lib
- - echo PYTHONPATH_FOLLOWS
+ - echo PYTHONPATH1_FOLLOWS
+ - echo $PYTHONPATH
+ - export PYTHONPATH=$CI_PROJECT_DIR/build/lib:$PYTHONPATH
+ - echo PYTHONPATH2_FOLLOWS
- echo $PYTHONPATH
- mkdir build
- cd build
@@ -94,9 +96,11 @@ windows:
- $QT_MSVC_DIR = "C:/Qt/msvc"
- $QTCMake_DIR = "$QT_MSVC_DIR/lib/cmake"
- $BUILD_DIR = "build"
+ - echo PYTHONPATH1_FOLLOWS
+ - echo "# Pythonpath1 <$Env:PYTHONPATH>"
- $PYTHONPATH="$CI_PROJECT_DIR/build/lib:$PYTHONPATH"
- - echo PYTHONPATH_FOLLOWS
- - echo "# Pythonpath <$Env:PYTHONPATH>"
+ - echo PYTHONPATH2_FOLLOWS
+ - echo "# Pythonpath2 <$Env:PYTHONPATH>"
# list powershell properties
- echo "# Path <$Env:Path>"
- echo "# Powershell <$PSHOME>`n PS Profile <$PROFILE>`n PS Command-Path <$PSCOMMANDPATH>"
--
GitLab