[gnome-build-meta/alatiera/push-master] .gitlab-ci.yml: Factour out cache into a yaml anchor
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/alatiera/push-master] .gitlab-ci.yml: Factour out cache into a yaml anchor
- Date: Thu, 27 Sep 2018 19:28:54 +0000 (UTC)
commit 2ab37d100e19e5ceffb6f2a2817ed83b0bb1548c
Author: Jordan Petridis <jpetridis gnome org>
Date: Thu Sep 27 22:27:09 2018 +0300
.gitlab-ci.yml: Factour out cache into a yaml anchor
This avoids duplicating declaration of cache and artifacts blocks.
.gitlab-ci.yml | 50 +++++++++++++++-----------------------------------
1 file changed, 15 insertions(+), 35 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e39ab0b..dd9dfea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,15 +12,6 @@ stages:
- track
- build
-
-# Store all the downloaded git and ostree repos in the cache.
-# This saves us fetching them on every build
-cache:
- key: bst
- paths:
- - "${XDG_CACHE_HOME}/buildstream/sources/"
-
-
before_script:
# Remove any installed buildstream binary
- pip3 uninstall -y buildstream
@@ -85,8 +76,22 @@ before_script:
fi
+.cache-template: &cache
+ # Store all the downloaded sources in the distributed cache, so that later
+ # jobs don't need to redownload them.
+ cache:
+ key: bst
+ paths:
+ - "${XDG_CACHE_HOME}/buildstream/sources/"
+ artifacts:
+ when: always
+ paths:
+ - logs
+ - project.refs
+
.build-template: &build
stage: build
+ <<: *cache
script:
- ${BST} -o arch "${ARCH}" build core.bst flatpak-runtimes.bst
@@ -108,38 +113,13 @@ before_script:
ssh gbm-builder.gnome.org gbm-flatpak-scripts/import-commits -c config/nightly.json
incoming/repo-${CI_JOB_ID} ${BRANCHES}
fi
- # Store all the downloaded git and ostree repos in the distributed cache.
- # This saves us fetching them from the different repos and further afield
- # on every build.
- cache:
- key: bst
- paths:
- - "${XDG_CACHE_HOME}/buildstream/sources/"
- # Store artifacts so we can inspect build failures
- artifacts:
- when: always
- paths:
- - logs
- - project.refs
-
track:
image: buildstream/buildstream-fedora:master-113-499df6a5
stage: track
+ <<: *cache
script:
- ${BST} track --deps all core.bst flatpak-runtimes.bst
- # Store all the downloaded sources in the distributed cache, so that later
- # jobs don't need to redownload them.
- cache:
- key: bst
- paths:
- - "${XDG_CACHE_HOME}/buildstream/sources/"
- artifacts:
- when: always
- paths:
- - logs
- - project.refs
-
build-gnome-core-x86_64:
image: buildstream/buildstream-fedora:master-113-499df6a5
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]