Mesa (master): gitlab-ci: refactor out some common stuff for Windows and Linux
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Oct 25 23:06:06 UTC 2019
Module: Mesa
Branch: master
Commit: 06e4647cb031f8ad0f904c8b71bef6d4583da13c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=06e4647cb031f8ad0f904c8b71bef6d4583da13c
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Wed Oct 23 14:21:31 2019 -0700
gitlab-ci: refactor out some common stuff for Windows and Linux
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
---
.gitlab-ci.yml | 19 ++++++++++++-------
.gitlab-ci/lava-gitlab-ci.yml | 2 +-
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a08a33f60f7..5e58f814409 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,13 +103,10 @@ debian-10:arm64:
# BUILD
-.build:
+# Shared between windows and Linux
+.build-common:
extends: .ci-run-policy
stage: build
- cache:
- key: ${CI_JOB_NAME}
- paths:
- - ccache
artifacts:
when: always
paths:
@@ -117,6 +114,14 @@ debian-10:arm64:
# scons:
- build/*/config.log
- shader-db
+
+# Just Linux
+.build-linux:
+ extends: .build-common
+ cache:
+ key: ${CI_JOB_NAME}
+ paths:
+ - ccache
variables:
CCACHE_COMPILERCHECK: "content"
# Use ccache transparently, and print stats before/after
@@ -139,14 +144,14 @@ debian-10:arm64:
.meson-build:
extends:
- - .build
+ - .build-linux
- .use-debian-10:amd64
script:
- .gitlab-ci/meson-build.sh
.scons-build:
extends:
- - .build
+ - .build-linux
- .use-debian-10:amd64
variables:
SCONSFLAGS: "-j4"
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 61af33243b1..036618dc975 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -60,7 +60,7 @@ lava-container:arm64:
.lava-build:
image: $CI_REGISTRY_IMAGE/debian/$LAVA_DEBIAN_VERSION:$DEBIAN_ARCH-$LAVA_IMAGE_TAG
extends:
- - .build
+ - .build-linux
# Use ccache transparently, and print stats before/after
before_script:
- mkdir -p results mesa-build
More information about the mesa-commit
mailing list