luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 22:03:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: Use extends rather than YAML anchors for only-default

Browse Source 
This makes things slightly more extensible in future, but introduces no
functional differences right now.

See https://docs.gitlab.com/ce/ci/yaml/README.html#extends.

Suggested by Jordan Petridis.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall 2019-11-28 11:38:25 +00:00
parent a2fa23ab73
commit 95b8c1c697
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.gitlab-ci.yml
View File

@ -14,14 +14,14 @@ variables:
G_MESSAGES_DEBUG: all G_MESSAGES_DEBUG: all
MESON_COMMON_OPTIONS: "--buildtype debug --fatal-meson-warnings" MESON_COMMON_OPTIONS: "--buildtype debug --fatal-meson-warnings"
.only-default: &only-default .only-default:
only: only:
- branches - branches
except: except:
- tags - tags
style-check-diff: style-check-diff:
<<: *only-default extends: .only-default
image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v5 image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v5
stage: style-check stage: style-check
allow_failure: true allow_failure: true
@ -31,7 +31,7 @@ style-check-diff:
- git diff -U0 --no-color $(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}) <(git rev-list --first-parent HEAD) | head -1) | ./clang-format-diff.py -binary "clang-format-7" -p1 - git diff -U0 --no-color $(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}) <(git rev-list --first-parent HEAD) | head -1) | ./clang-format-diff.py -binary "clang-format-7" -p1
fedora-x86_64: fedora-x86_64:
<<: *only-default extends: .only-default
image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
stage: build stage: build
variables: variables:
@ -71,7 +71,7 @@ fedora-x86_64:
- "_coverage" - "_coverage"
debian-stable-x86_64: debian-stable-x86_64:
<<: *only-default extends: .only-default
image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v5 image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v5
stage: build stage: build
script: script:
@ -99,7 +99,7 @@ debian-stable-x86_64:
- "_build/${CI_JOB_NAME}-report.xml" - "_build/${CI_JOB_NAME}-report.xml"
G_DISABLE_ASSERT: G_DISABLE_ASSERT:
<<: *only-default extends: .only-default
image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
stage: build stage: build
variables: variables:
@ -126,7 +126,7 @@ G_DISABLE_ASSERT:
- "_build/${CI_JOB_NAME}-report.xml" - "_build/${CI_JOB_NAME}-report.xml"
valgrind: valgrind:
<<: *only-default extends: .only-default
image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
stage: analysis stage: analysis
variables: variables:
@ -159,7 +159,7 @@ valgrind:
- "_build/meson-logs" - "_build/meson-logs"
.cross-template: &cross-template .cross-template: &cross-template
<<: *only-default extends: .only-default
stage: build stage: build
artifacts: artifacts:
name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
@ -194,7 +194,7 @@ cross-mingw64:
- ninja -C _build - ninja -C _build
msys2-mingw32: msys2-mingw32:
<<: *only-default extends: .only-default
stage: build stage: build
tags: tags:
- win32 - win32
@ -215,7 +215,7 @@ msys2-mingw32:
- _coverage/ - _coverage/
vs2017-x64: vs2017-x64:
<<: *only-default extends: .only-default
stage: build stage: build
tags: tags:
- win32 - win32
@ -297,7 +297,7 @@ freebsd-12-x86_64:
- "_build/${CI_JOB_NAME}-report.xml" - "_build/${CI_JOB_NAME}-report.xml"
coverage: coverage:
<<: *only-default extends: .only-default
image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
stage: coverage stage: coverage
artifacts: artifacts:
@ -309,7 +309,7 @@ coverage:
coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/' coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
scan-build: scan-build:
<<: *only-default extends: .only-default
image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
stage: analysis stage: analysis
script: script: