[gimp/wip/schumaml/tune-prepare-stage] build: CI crossroad install deps needs to run inside the Dockerfile, of course



commit 224d59d7d3adaaad0ac007c2e7ec743f1bee1a5e
Author: Michael Schumacher <schumaml gmx de>
Date:   Sat May 30 22:35:40 2020 +0200

    build: CI crossroad install deps needs to run inside the Dockerfile, of course

 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24d75e31e1..9ca562151e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,7 +72,7 @@ build-image-win64:
     - echo "RUN apt-get install -y --no-install-recommends \\" >> Dockerfile
     - echo "g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64" >> Dockerfile
 
-    - crossroad w64 gimp --run="crossroad_deps_install.sh"
+    - echo 'RUN crossroad w64 gimp --run="crossroad_deps_install.sh"' >> Dockerfile
 
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$BUILD_IMAGE_WIN64 --cache=true --cache-ttl=120h
 
@@ -82,6 +82,8 @@ build-image-win32:
     - echo "RUN apt-get install -y --no-install-recommends \\" >> Dockerfile
     - echo "g++-mingw-w64-i686 gcc-mingw-w64-i686" >> Dockerfile
 
+    - echo 'RUN crossroad w32 gimp --run="crossroad_deps_install.sh"' >> Dockerfile
+
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$BUILD_IMAGE_WIN32 --cache=true --cache-ttl=120h
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]