X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=50b7f9ef896eed5996d90af81f3b854ea1f5c65a;hb=01443dc7383f4634e4a66fa194ed51db74186128;hp=d4508f82a2d0bad90cd31b7cb749899c7746b36a;hpb=e6b2af56cb037e3174d049478e0ad7c7715780e4;p=mesa.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4508f82a2d..50b7f9ef896 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,23 +3,51 @@ variables: include: - project: 'wayland/ci-templates' - # Must be the same as in .gitlab-ci/lava-gitlab-ci.yml - ref: 0a9bdd33a98f05af6761ab118b5074952242aab0 + ref: b7030c2cd0d6ccc5f6d4f8299bafa4daa9240d71 file: '/templates/debian.yml' - -include: - local: '.gitlab-ci/lava-gitlab-ci.yml' stages: - container - build - test + - success # When to automatically run the CI .ci-run-policy: rules: - - when: on_success + # Run pipeline by default for merge requests changing files affecting it + - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + changes: &paths + - VERSION + - bin/**/* + # GitLab CI + - .gitlab-ci.yml + - .gitlab-ci/**/* + # Meson + - meson* + - build-support/**/* + - subprojects/**/* + # SCons + - SConstruct + - scons/**/* + - common.py + # Source code + - include/**/* + - src/**/* + when: on_success + # Run pipeline by default in the main project if files affecting it were + # changed + - if: '$CI_PROJECT_PATH == "mesa/mesa"' + changes: + *paths + when: on_success + # Allow triggering jobs manually on branches of forked projects + - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' + when: manual + # Otherwise, most jobs won't run + - when: never retry: max: 2 when: @@ -27,6 +55,20 @@ stages: # Cancel CI run if a newer commit is pushed to the same branch interruptible: true +success: + stage: success + image: debian:stable-slim + only: + - merge_requests + except: + changes: + *paths + variables: + GIT_STRATEGY: none + script: + - echo "Dummy job to make sure every merge request pipeline runs at least one job" + + .ci-deqp-artifacts: artifacts: when: always @@ -36,7 +78,7 @@ stages: # https://gitlab.com/gitlab-org/gitlab-ce/commit/8788fb925706cad594adf6917a6c5f6587dd1521 - artifacts -# Build the "normal" (non-LAVA) CI docker images. +# Build the CI docker images. # # DEBIAN_TAG is the tag of the docker image used by later stage jobs. If the # image doesn't exist yet, the container stage job generates it. @@ -57,32 +99,6 @@ stages: stage: container extends: - .ci-run-policy - rules: - # Run pipeline by default for merge requests changing files affecting it - - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' - changes: - - VERSION - - bin/**/* - # GitLab CI - - .gitlab-ci.yml - - .gitlab-ci/**/* - # Meson - - meson* - - build-support/**/* - - subprojects/**/* - # SCons - - SConstruct - - scons/**/* - - common.py - # Source code - - include/**/* - - src/**/* - when: on_success - # Always run pipeline by default in the main project - - if: '$CI_PROJECT_PATH == "mesa/mesa"' - when: on_success - # Otherwise, allow triggering jobs manually - - when: manual variables: DEBIAN_VERSION: buster-slim REPO_SUFFIX: $CI_JOB_NAME @@ -96,7 +112,7 @@ x86_build: - .debian@container-ifnot-exists - .container variables: - DEBIAN_TAG: &x86_build "2019-11-13" + DEBIAN_TAG: &x86_build "2020-02-05" .use-x86_build: variables: @@ -109,13 +125,13 @@ x86_build: x86_test-gl: extends: x86_build variables: - DEBIAN_TAG: &x86_test-gl "2019-12-05" + DEBIAN_TAG: &x86_test-gl "2020-01-30" # Debian 10 based x86 test image for VK x86_test-vk: extends: x86_build variables: - DEBIAN_TAG: &x86_test-vk "2019-11-22" + DEBIAN_TAG: &x86_test-vk "2020-01-14" # Can only be triggered manually on personal branches because RADV is the only # driver that does Vulkan testing at the moment. rules: @@ -149,7 +165,7 @@ arm_build: - .debian@container-ifnot-exists@arm64v8 - .container variables: - DEBIAN_TAG: &arm_build "2019-11-13" + DEBIAN_TAG: &arm_build "2020-02-05" .use-arm_build: variables: @@ -162,7 +178,7 @@ arm_build: arm_test: extends: arm_build variables: - DEBIAN_TAG: &arm_test "2019-11-22" + DEBIAN_TAG: &arm_test "2020-01-30" .use-arm_test: variables: @@ -215,6 +231,8 @@ arm_test: extends: - .build-linux - .use-x86_build + variables: + LLVM_VERSION: 9 script: - .gitlab-ci/meson-build.sh @@ -268,7 +286,6 @@ meson-main: -D gallium-nine=true -D gallium-opencl=disabled GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" - LLVM_VERSION: "7" EXTRA_OPTION: > -D osmesa=gallium -D tools=all @@ -295,6 +312,7 @@ meson-main: -D gallium-va=false -D gallium-xa=false -D gallium-nine=false + LLVM_VERSION: "8" .meson-arm: extends: @@ -303,23 +321,26 @@ meson-main: variables: VULKAN_DRIVERS: freedreno GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4" - EXTRA_OPTION: > - -D I-love-half-baked-turnips=true + BUILDTYPE: "debugoptimized" tags: - aarch64 meson-armhf: - extends: .meson-arm + extends: + - .meson-arm + - .ci-deqp-artifacts variables: CROSS: armhf LLVM_VERSION: "7" + script: + - .gitlab-ci/meson-build.sh + - .gitlab-ci/prepare-artifacts.sh meson-arm64: extends: - .meson-arm - .ci-deqp-artifacts variables: - BUILDTYPE: "debugoptimized" VULKAN_DRIVERS: "freedreno,amd" script: - .gitlab-ci/meson-build.sh @@ -334,8 +355,8 @@ meson-clang: DRI_DRIVERS: "auto" GALLIUM_DRIVERS: "auto" VULKAN_DRIVERS: intel,amd,freedreno - CC: "ccache clang-8" - CXX: "ccache clang++-8" + CC: "ccache clang-9" + CXX: "ccache clang++-9" .meson-windows: extends: @@ -425,7 +446,6 @@ meson-vulkan: -D cpp_args=-fno-sanitize-recover=all UBSAN_OPTIONS: "print_stacktrace=1" VULKAN_DRIVERS: intel,amd,freedreno - LLVM_VERSION: "8" EXTRA_OPTION: > -D vulkan-overlay-layer=true @@ -443,6 +463,27 @@ meson-i386: -D vulkan-overlay-layer=true -D llvm=false -D osmesa=classic + -D werror=true + +meson-s390x: + extends: + - .meson-cross + variables: + CROSS: s390x + GALLIUM_DRIVERS: "swrast" + LLVM_VERSION: "7" + script: + - dpkg -i /var/cache/apt/archives/$CROSS/*.deb + - .gitlab-ci/meson-build.sh + +meson-ppc64el: + extends: + - meson-s390x + variables: + CROSS: ppc64el + GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl" + LLVM_VERSION: "8" + VULKAN_DRIVERS: "amd" meson-mingw32-x86_64: extends: .meson-build @@ -462,7 +503,7 @@ scons: SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check" script: - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh - - LLVM_VERSION=8 .gitlab-ci/scons-build.sh + - LLVM_VERSION=9 .gitlab-ci/scons-build.sh scons-old-llvm: extends: @@ -533,6 +574,7 @@ piglit-quick_gl: -x arb_gpu_shader5 -x egl_ext_device_ -x egl_ext_platform_device + -x ext_timer_query@time-elapsed -x glx-multithread-clearbuffer -x glx-multithread-shader-compile -x max-texture-size @@ -602,7 +644,7 @@ test-softpipe-gles31: DEQP_VER: gles31 extends: test-softpipe-gles2 -arm64_a630_gles2: +.arm64_a630_gles2: extends: - .deqp-test-gl - .use-arm_test @@ -618,18 +660,18 @@ arm64_a630_gles2: dependencies: - meson-arm64 -arm64_a630_gles31: - extends: arm64_a630_gles2 +.arm64_a630_gles31: + extends: .arm64_a630_gles2 variables: DEQP_VER: gles31 -arm64_a630_gles3: - extends: arm64_a630_gles2 +.arm64_a630_gles3: + extends: .arm64_a630_gles2 variables: DEQP_VER: gles3 arm64_a306_gles2: - extends: arm64_a630_gles2 + extends: .arm64_a630_gles2 variables: DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt DEQP_SKIPS: deqp-default-skips.txt