The `distcheck` stage creates a tarball ready for the distribution, and
compiles it with the autotools to ensure everything works fine.
But it does not try with the other tools: scons and meson.
Hence, let's add a new stage that takes the generated tarball and builds
it using meson and scons.
Signed-off-by: Juan A. Suarez Romero <jasua...@igalia.com>
Acked-by: Daniel Stone <dani...@collabora.com>
---
.gitlab-ci.yml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31f69ceb29e..ffed0ec8c65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ stages:
- base
- llvm
- mesa
+ - tarball
variables:
DOCKER_IMAGE: $CI_REGISTRY_IMAGE
@@ -48,6 +49,14 @@ after_script:
script:
- ../rocker build -f gitlab-ci/Rockerfile.mesa --var BUILD=$BUILD --var
LLVM=$LLVM --var TAG=$CI_COMMIT_REF_SLUG .
+.build_tarball: &build_tarball
+ stage: tarball
+ dependencies:
+ - distcheck
+ script:
+ - tar -xf release-output/mesa-*.tar.xz
+ - ../rocker build -f gitlab-ci/Rockerfile.mesa --var BUILD=$BUILD --var
LLVM=$LLVM mesa-*
+
base:
stage: base
script:
@@ -178,3 +187,18 @@ windows:
variables:
BUILD: "windows"
<<: *build_mesa
+
+tarball:meson:
+ variables:
+ BUILD: "meson"
+ <<: *build_tarball
+
+tarball:scons:
+ variables:
+ BUILD: "scons"
+ <<: *build_tarball
+
+tarball:windows:
+ variables:
+ BUILD: "windows"
+ <<: *build_tarball
--
2.17.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
