stage: container+docs
rules:
- *ignore_scheduled_pipelines
- - if: '$CI_PROJECT_NAMESPACE == "mesa"'
- when: never
- if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
changes: *docs-or-ci
when: on_success
+ - if: '$GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME && $CI_PROJECT_PATH == "mesa/mesa"'
+ changes: *docs-or-ci
+ when: on_success
- changes: *docs-or-ci
when: manual
# Other cases default to never
image: debian:stable-slim
rules:
- *ignore_scheduled_pipelines
- - if: '$CI_PROJECT_NAMESPACE == "mesa"'
+ - if: '$CI_PROJECT_NAMESPACE == "mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
when: never
- if: '$GITLAB_USER_LOGIN == "marge-bot"'
changes: *docs-or-ci
when: never
- changes: *all_paths
when: never
- - when: on_success
+ - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
+ when: on_success
variables:
GIT_STRATEGY: none
script:
- *ignore_scheduled_pipelines
# Run pipeline by default in the main project if any CI pipeline
# configuration files were changed, to ensure docker images are up to date
- - if: '$CI_PROJECT_PATH == "mesa/mesa"'
+ - if: '$CI_PROJECT_PATH == "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
changes:
- .gitlab-ci.yml
- .gitlab-ci/**/*
when: on_success
# Run pipeline by default in the main project if it was not triggered by
# Marge Bot, and any files affecting the pipeline were changed
- - if: '$GITLAB_USER_LOGIN != "marge-bot" && $CI_PROJECT_PATH == "mesa/mesa"'
+ - if: '$GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME && $CI_PROJECT_PATH == "mesa/mesa"'
changes:
*all_paths
when: on_success
- .fdo.container-build@debian
- .container
variables:
- FDO_DISTRIBUTION_TAG: &x86_build-base "2020-07-28-x86-2"
+ FDO_DISTRIBUTION_TAG: &x86_build-base "2020-08-13-gold"
.use-x86_build-base:
extends:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_build "2020-08-08-glvnd"
+ FDO_DISTRIBUTION_TAG: &x86_build "2020-08-13-gold"
.use-x86_build:
variables:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &i386_build "2020-07-28-x86-2"
+ FDO_DISTRIBUTION_TAG: &i386_build "2020-08-13-gold"
.use-i386_build:
variables:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-28-x86-2"
+ FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-08-13-gold"
.use-ppc64el_build:
variables:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &s390x_build "2020-07-28-x86-2"
+ FDO_DISTRIBUTION_TAG: &s390x_build "2020-08-13-gold"
.use-s390x_build:
variables:
x86_test-base:
extends: x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-base "2020-07-28-x86-2"
+ FDO_DISTRIBUTION_TAG: &x86_test-base "2020-08-13-gold"
.use-x86_test-base:
extends:
x86_test-gl:
extends: .use-x86_test-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-08-14-xcb-shm"
+ FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-08-31-deqp-version"
# Debian 10 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-07-28-x86-2"
+ FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-08-31-deqp-version"
# Debian 9 based x86 build image (old LLVM)
x86_build_old:
extends: x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_build_old "2020-07-28-x86-2"
+ FDO_DISTRIBUTION_TAG: &x86_build_old "2020-08-13-gold"
FDO_DISTRIBUTION_VERSION: stretch-slim
.use-x86_build_old:
- .fdo.container-build@debian@arm64v8
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_build "2020-08-04-nfs-2"
+ FDO_DISTRIBUTION_TAG: &arm_build "2020-08-31-deqp-version"
.use-arm_build:
variables:
- .fdo.container-build@debian
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_test-base "2020-07-28-libdrm"
+ FDO_DISTRIBUTION_TAG: &arm_test-base "2020-08-13-gold"
.use-arm_test-base:
extends:
extends:
- .use-arm_test-base
variables:
- FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-18"
+ FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-31-deqp-version"
.use-arm64_test:
variables:
- .gitlab-ci/run-shader-db.sh
- src/freedreno/.gitlab-ci/run-fdtools.sh
+# Test a release build with -Werror so new warnings don't sneak in.
+meson-release:
+ extends: .meson-build
+ variables:
+ UNWIND: "enabled"
+ DRI_LOADERS: >
+ -D glx=dri
+ -D gbm=enabled
+ -D egl=enabled
+ -D platforms=x11,wayland
+ GALLIUM_ST: >
+ -D dri3=enabled
+ -D gallium-extra-hud=true
+ -D gallium-vdpau=enabled
+ -D gallium-xvmc=disabled
+ -D gallium-omx=disabled
+ -D gallium-va=enabled
+ -D gallium-xa=enabled
+ -D gallium-nine=false
+ -D gallium-opencl=disabled
+ -D llvm=false
+ GALLIUM_DRIVERS: "nouveau,kmsro,r300,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink"
+ BUILDTYPE: "release"
+ EXTRA_OPTION: >
+ -D osmesa=none
+ -D tools=all
+ -D werror=true
+ script:
+ - .gitlab-ci/meson-build.sh
+
meson-classic:
extends: .meson-build
variables:
FD_MESA_DEBUG: nobypass
NIR_VALIDATE: 1
+arm64_a630_gl:
+ extends: arm64_a630_gles2
+ variables:
+ DEQP_VER: gl30
+
arm64_a630_vk:
extends: arm64_a630_gles2
variables: