diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-11-12 12:13:11 +0000 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@intel.com> | 2019-11-12 23:37:41 +0000 |
| commit | 1128fa10d69c7ce90940fab28daad3aa102428e3 (patch) | |
| tree | 491e3e67e2ba2d9a6ce8d9b82b8e9fffeaee5d4e /.gitlab-ci.yml | |
| parent | d5682defcdff6bbec295a4407841ccecc0599200 (diff) | |
| download | libdrm-1128fa10d69c7ce90940fab28daad3aa102428e3.tar.gz libdrm-1128fa10d69c7ce90940fab28daad3aa102428e3.tar.bz2 libdrm-1128fa10d69c7ce90940fab28daad3aa102428e3.zip | |
gitlab-ci: drop arch build down to daily builds
Suggested-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05aa7438..765a18d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,17 +17,11 @@ variables: DEBIAN_TAG: "2019-10-20" DEBIAN_VERSION: buster-slim DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG" - ARCH_TAG: "2019-10-20" - ARCH_VERSION: rolling - ARCH_IMAGE: "$CI_REGISTRY_IMAGE/archlinux/$ARCH_VERSION:$ARCH_TAG" include: - project: 'wayland/ci-templates' ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c file: '/templates/debian.yml' - - project: 'wayland/ci-templates' - ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c - file: '/templates/arch.yml' stages: - containers @@ -36,6 +30,8 @@ stages: # When & how to run the CI .ci-run-policy: + except: + - schedules retry: max: 2 when: @@ -52,21 +48,11 @@ debian: GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh' -arch: - stage: containers - extends: - - .ci-run-policy - - .arch@container-ifnot-exists - variables: - GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image - ARCH_EXEC: 'bash .gitlab-ci/arch-install.sh' - # BUILD .meson-build: stage: build - extends: .ci-run-policy variables: GIT_DEPTH: 10 script: @@ -96,14 +82,29 @@ arch: paths: - _build/meson-logs/* -meson-debian: - extends: .meson-build +meson-x86_64: + extends: + - .ci-run-policy + - .meson-build image: $DEBIAN_IMAGE needs: - debian -meson-arch: +meson-arch-daily: + rules: + - if: '$SCHEDULE == "arch-daily"' + when: on_success + - when: never + image: archlinux/base + before_script: + - pacman -Syu --noconfirm --needed + base-devel + cairo + cunit + docbook-xsl + libatomic_ops + libpciaccess + libxslt + meson + valgrind extends: .meson-build - image: $ARCH_IMAGE - needs: - - arch |