[glib/wip/pwithnall/ci-cleanups: 1/7] ci: Port from YAML anchors to GitLab extends
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/pwithnall/ci-cleanups: 1/7] ci: Port from YAML anchors to GitLab extends
- Date: Sun, 20 Feb 2022 12:50:48 +0000 (UTC)
commit 32aa9b7349364cf812bcda58b5ced848c156bd44
Author: Philip Withnall <pwithnall endlessos org>
Date: Sun Feb 20 12:25:41 2022 +0000
ci: Port from YAML anchors to GitLab extends
See https://docs.gitlab.com/ee/ci/yaml/yaml_optimization.html#use-extends-to-reuse-configuration-sections
Since we’re already using `extends` in other places in the configuration
file, it seems simpler to use it everywhere.
This should introduce no functional changes.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfd955462..999e9d5b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -235,7 +235,7 @@ valgrind:
- "_build/glib/glibconfig.h"
- "_build/meson-logs"
-.cross-template: &cross-template
+.cross-template:
extends: .build
stage: build
needs: []
@@ -246,7 +246,7 @@ valgrind:
- "_build/meson-logs"
cross-android_api21_arm64:
- <<: *cross-template
+ extends: .cross-template
image: $ANDROID_IMAGE
script:
# FIXME: add --werror
@@ -256,7 +256,7 @@ cross-android_api21_arm64:
- ninja -C _build
cross-android_api28_arm64:
- <<: *cross-template
+ extends: .cross-template
image: $ANDROID_IMAGE
script:
# FIXME: add --werror
@@ -264,7 +264,7 @@ cross-android_api28_arm64:
- ninja -C _build
cross-mingw64:
- <<: *cross-template
+ extends: .cross-template
image: $MINGW_IMAGE
script:
# FIXME: Add --werror
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]