summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorChristoph Reiter <creiter@src.gnome.org>2018-04-11 12:18:55 +0200
committerChristoph Reiter <creiter@src.gnome.org>2018-04-11 15:33:00 +0200
commitc542115906ff2623b157ee540150af91cba82f8e (patch)
tree4f0fcfea3ae136fb8a1ae30c81beb5e3239bc6f1 /.gitlab-ci.yml
parentd448be007ee2111794dcd9315a6441c6127c920c (diff)
downloadgtk+-c542115906ff2623b157ee540150af91cba82f8e.tar.gz
gitlab-ci: Reenable ccache but disable it during the initial meson call
There where some problems (??) with ccache not detecting changes during meson checks. Setting CCACHE_DISABLE during the meson execution makes ccache not use the cache and pass things directly to the compiler.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml28
1 files changed, 17 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbabf994af..5c1580ca87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,25 +2,28 @@ stages:
- build
- flatpak
-gtk:
+.cache-paths: &cache-paths
+ paths:
+ - _ccache/
+ - subprojects/gdk-pixbuf/
+ - subprojects/glib/
+ - subprojects/graphene/
+ - subprojects/libepoxy/
+ - subprojects/pango/
+
+fedora-x86_64:
image: ebassi/gitlab-gtk:latest
stage: build
- before_script:
- - export CCACHE_DISABLE=true_
script:
- bash -x ./.gitlab-ci/test-docker.sh
- cache:
- paths:
- - subprojects/gdk-pixbuf/
- - subprojects/glib/
- - subprojects/graphene/
- - subprojects/libepoxy/
- - subprojects/pango/
artifacts:
when: on_failure
name: "gtk-${CI_COMMIT_REF_NAME}"
paths:
- "${CI_PROJECT_DIR}/_build/meson-logs"
+ cache:
+ key: "$CI_JOB_NAME"
+ <<: *cache-paths
.mingw-defaults: &mingw-defaults
stage: build
@@ -29,8 +32,11 @@ gtk:
script:
- C:\msys64\usr\bin\pacman --noconfirm -Syyuu
- C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
+ cache:
+ key: "%CI_JOB_NAME%"
+ <<: *cache-paths
-mingw32:
+msys2-mingw32:
variables:
MSYSTEM: "MINGW32"
CHERE_INVOKING: "yes"