[gimp/wip/Jehan/native-win64-build] Get rid of ccache and add artifacts.



commit f494a517064fa4f596d9ede0dfb75c2d10b7bec5
Author: Jehan <jehan girinstud io>
Date:   Tue May 4 19:34:22 2021 +0200

    Get rid of ccache and add artifacts.
    
    Let's simplify the build first by not having ccache. Then let's see
    what's inside _babl/ dir.

 .gitlab-ci.yml               |  6 ++++++
 build/windows/build-msys2.sh | 15 +++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61db2d5bf3..17bd50be59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -196,6 +196,12 @@ deps-native-win64:
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/build-msys2.sh"
+  artifacts:
+    name: "GIMP-Win-native-${CI_COMMIT_SHORT_SHA}"
+    when: always
+    expire_in: 2 days
+    paths:
+    - _babl
   needs: []
 
 deps-win64:
diff --git a/build/windows/build-msys2.sh b/build/windows/build-msys2.sh
index 2121a25d4f..23afaade63 100644
--- a/build/windows/build-msys2.sh
+++ b/build/windows/build-msys2.sh
@@ -31,7 +31,6 @@ pacman --noconfirm -Suy
 pacman --noconfirm -S --needed \
     base-devel \
     mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-ccache \
     mingw-w64-$MSYS2_ARCH-pkg-config \
     mingw-w64-$MSYS2_ARCH-meson \
     \
@@ -77,10 +76,10 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-babl \
     mingw-w64-$MSYS2_ARCH-gegl
 
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-export CC="ccache gcc"
+#mkdir -p _ccache
+#export CCACHE_BASEDIR="$(pwd)"
+#export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+#export CC="ccache gcc"
 
 export GIT_DEPTH=1
 export GIMP_PREFIX=`realpath ~/_install`
@@ -143,11 +142,11 @@ ninja install
 cd ../..
 
 # Build
-ccache --zero-stats
-ccache --show-stats
+#ccache --zero-stats
+#ccache --show-stats
 
 ./autogen.sh --prefix="${GIMP_PREFIX}"
 make -j4
 make install
 
-ccache --show-stats
+#ccache --show-stats


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