[gnome-build-meta/abderrahim/child-pipelines] .gitlab-ci.yml: move architecture specific settings to a separate file
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/child-pipelines] .gitlab-ci.yml: move architecture specific settings to a separate file
- Date: Wed, 5 Aug 2020 03:41:48 +0000 (UTC)
commit 7156304d46e19607bec10f025c51d1237055be35
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Tue Aug 4 19:33:44 2020 +0100
.gitlab-ci.yml: move architecture specific settings to a separate file
.gitlab-ci.yml | 53 ++---------------------------------------------------
.gitlab-ci/arch.yml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 51 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c43b6605..be6ae47a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+include: .gitlab-ci/arch.yml
+
variables:
# Store all the bst stuff under the "${CI_PROJECT_DIR}" directory.
# Note that GitLab CI will only cache stuff inside the "${CI_PROJECT_DIR}" folder.
@@ -9,13 +11,6 @@ variables:
BST: "bst $BST_STRICT --config build.conf --log-file logs/build.log --colors"
FLATPAK_BRANCH: master
- # Docker Images
- DOCKER_REGISTRY: "registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images"
- DOCKER_IMAGE_ID: "e60e2dccd1ac4e928d62472676762d8e3e4a1406"
- DOCKER_AMD64: "${DOCKER_REGISTRY}/bst14/amd64:${DOCKER_IMAGE_ID}"
- DOCKER_AARCH64: "${DOCKER_REGISTRY}/bst14/arm64:${DOCKER_IMAGE_ID}"
- DOCKER_PPC64LE: "${DOCKER_REGISTRY}/bst14/ppc64le:${DOCKER_IMAGE_ID}"
-
stages:
- track
- build
@@ -188,50 +183,6 @@ default:
rules: &ostree-publish-rules
- if: $CI_COMMIT_REF_NAME == "master"
-#
-# Architecture specific settings
-#
-
-.x86_64:
- image: "${DOCKER_AMD64}"
- tags:
- - x86_64
- - gnome-build-meta
- variables:
- ARCH: x86_64
-
-.i686:
- image: "${DOCKER_AMD64}"
- tags:
- - x86_64
- - gnome-build-meta
- variables:
- ARCH: i686
-
-.aarch64:
- image: "${DOCKER_AARCH64}"
- tags:
- - aarch64
- - gnome-build-meta
- variables:
- ARCH: aarch64
-
-.arm:
- image: "${DOCKER_AARCH64}"
- tags:
- - armhf
- - gnome-build-meta
- variables:
- ARCH: arm
-
-.ppc64le:
- image: "${DOCKER_PPC64LE}"
- tags:
- - ppc64le
- - gnome-build-meta
- variables:
- ARCH: ppc64le
- allow_failure: true
#
# "Real" CI jobs
diff --git a/.gitlab-ci/arch.yml b/.gitlab-ci/arch.yml
new file mode 100644
index 00000000..727fb797
--- /dev/null
+++ b/.gitlab-ci/arch.yml
@@ -0,0 +1,53 @@
+variables:
+ # Docker Images
+ DOCKER_REGISTRY: "registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images"
+ DOCKER_IMAGE_ID: "e60e2dccd1ac4e928d62472676762d8e3e4a1406"
+
+ DOCKER_AMD64: "${DOCKER_REGISTRY}/bst14/amd64:${DOCKER_IMAGE_ID}"
+ DOCKER_AARCH64: "${DOCKER_REGISTRY}/bst14/arm64:${DOCKER_IMAGE_ID}"
+ DOCKER_PPC64LE: "${DOCKER_REGISTRY}/bst14/ppc64le:${DOCKER_IMAGE_ID}"
+
+#
+# Architecture specific settings
+#
+
+.x86_64:
+ image: "${DOCKER_AMD64}"
+ tags:
+ - x86_64
+ - gnome-build-meta
+ variables:
+ ARCH: x86_64
+
+.i686:
+ image: "${DOCKER_AMD64}"
+ tags:
+ - x86_64
+ - gnome-build-meta
+ variables:
+ ARCH: i686
+
+.aarch64:
+ image: "${DOCKER_AARCH64}"
+ tags:
+ - aarch64
+ - gnome-build-meta
+ variables:
+ ARCH: aarch64
+
+.arm:
+ image: "${DOCKER_AARCH64}"
+ tags:
+ - armhf
+ - gnome-build-meta
+ variables:
+ ARCH: arm
+
+.ppc64le:
+ image: "${DOCKER_PPC64LE}"
+ tags:
+ - ppc64le
+ - gnome-build-meta
+ variables:
+ ARCH: ppc64le
+ allow_failure: true
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]