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>main
parent
d5682defcd
commit
1128fa10d6
|
@ -17,17 +17,11 @@ variables:
|
||||||
DEBIAN_TAG: "2019-10-20"
|
DEBIAN_TAG: "2019-10-20"
|
||||||
DEBIAN_VERSION: buster-slim
|
DEBIAN_VERSION: buster-slim
|
||||||
DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
|
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:
|
include:
|
||||||
- project: 'wayland/ci-templates'
|
- project: 'wayland/ci-templates'
|
||||||
ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
|
ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
|
||||||
file: '/templates/debian.yml'
|
file: '/templates/debian.yml'
|
||||||
- project: 'wayland/ci-templates'
|
|
||||||
ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
|
|
||||||
file: '/templates/arch.yml'
|
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- containers
|
- containers
|
||||||
|
@ -36,6 +30,8 @@ stages:
|
||||||
|
|
||||||
# When & how to run the CI
|
# When & how to run the CI
|
||||||
.ci-run-policy:
|
.ci-run-policy:
|
||||||
|
except:
|
||||||
|
- schedules
|
||||||
retry:
|
retry:
|
||||||
max: 2
|
max: 2
|
||||||
when:
|
when:
|
||||||
|
@ -52,21 +48,11 @@ debian:
|
||||||
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
|
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
|
||||||
DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
|
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
|
# BUILD
|
||||||
|
|
||||||
.meson-build:
|
.meson-build:
|
||||||
stage: build
|
stage: build
|
||||||
extends: .ci-run-policy
|
|
||||||
variables:
|
variables:
|
||||||
GIT_DEPTH: 10
|
GIT_DEPTH: 10
|
||||||
script:
|
script:
|
||||||
|
@ -96,14 +82,29 @@ arch:
|
||||||
paths:
|
paths:
|
||||||
- _build/meson-logs/*
|
- _build/meson-logs/*
|
||||||
|
|
||||||
meson-debian:
|
meson-x86_64:
|
||||||
extends: .meson-build
|
extends:
|
||||||
|
- .ci-run-policy
|
||||||
|
- .meson-build
|
||||||
image: $DEBIAN_IMAGE
|
image: $DEBIAN_IMAGE
|
||||||
needs:
|
needs:
|
||||||
- debian
|
- 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
|
extends: .meson-build
|
||||||
image: $ARCH_IMAGE
|
|
||||||
needs:
|
|
||||||
- arch
|
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -o errexit
|
|
||||||
set -o xtrace
|
|
||||||
|
|
||||||
pacman -Syu --noconfirm --needed \
|
|
||||||
base-devel \
|
|
||||||
cairo \
|
|
||||||
cunit \
|
|
||||||
docbook-xsl \
|
|
||||||
libatomic_ops \
|
|
||||||
libpciaccess \
|
|
||||||
libxslt \
|
|
||||||
meson \
|
|
||||||
valgrind
|
|
Loading…
Reference in New Issue