[gimp/wip/schumaml/crossraods-optimization] gitlab-ci: variable seem to cause runner errors, pkgconfig does still not find babl
- From: Michael Schumacher <schumaml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/schumaml/crossraods-optimization] gitlab-ci: variable seem to cause runner errors, pkgconfig does still not find babl
- Date: Thu, 3 Dec 2020 19:06:36 +0000 (UTC)
commit d50d30c31e8727a725b2e601c30a93f4eee65bd9
Author: Michael Schumacher <schumaml gmx de>
Date: Thu Dec 3 20:05:59 2020 +0100
gitlab-ci: variable seem to cause runner errors, pkgconfig does still not find babl
.gitlab-ci.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0999c5377..631c5330d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -199,7 +199,7 @@ deps-win64:
variables:
XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
XDG_DATA_HOME: "/usr/local/lib/"
- PREFIX: "$CI_PROJECT_DIR/.local/"
+ PREFIX: "$CI_PROJECT_DIR/.local"
cache:
paths:
- .cache/crossroad/
@@ -266,16 +266,16 @@ deps-win32:
variables:
XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
XDG_DATA_HOME: "/usr/local/lib/"
- PREFIX: "$CI_PROJECT_DIR/.local/"
- PATH: "$PREFIX/bin:$PATH"
- PKG_CONFIG_PATH: "$PREFIX/share/pkgconfig:$PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
- LD_LIBRARY_PATH: "$PREFIX/lib/:$PREFIX/lib:$LD_LIBRARY_PATH"
- XDG_DATA_DIRS: "$PREFIX/share/:$XDG_DATA_DIRS"
+ PREFIX: "$CI_PROJECT_DIR/.local"
cache:
paths:
- .cache/crossroad/
- apt-cache
before_script:
+ - export PATH="$PREFIX/bin:$PATH"
+ - export PKG_CONFIG_PATH="$PREFIX/share/pkgconfig:$PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
+ - export LD_LIBRARY_PATH="$PREFIX/lib/:$PREFIX/lib:$LD_LIBRARY_PATH"
+ - export XDG_DATA_DIRS="$PREFIX/share/:$XDG_DATA_DIRS"
script:
- export PATH="`pwd`/.local/bin:$PATH"
- mkdir _deps && cd _deps
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]