projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compiler/types: Fix deserializing structs with >= 15 members
[mesa.git]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index 3fea645d4140eaa5735e71362401773805f9da74..234f8e6524cba623b554a7145942dbedae4bc20d 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-76,7
+76,8
@@
test-docs:
- 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
- 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
+ - if: '$CI_PROJECT_PATH != "mesa/mesa" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
+ changes: *docs-or-ci
when: manual
# Other cases default to never
when: manual
# Other cases default to never
@@
-296,13
+297,13
@@
x86_test-base:
x86_test-gl:
extends: .use-x86_test-base
variables:
x86_test-gl:
extends: .use-x86_test-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-08-
24-gold
"
+ 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:
# Debian 10 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-08-
13-gold
"
+ FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-08-
31-deqp-version
"
# Debian 9 based x86 build image (old LLVM)
x86_build_old:
# Debian 9 based x86 build image (old LLVM)
x86_build_old:
@@
-324,7
+325,7
@@
arm_build:
- .fdo.container-build@debian@arm64v8
- .container
variables:
- .fdo.container-build@debian@arm64v8
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_build "2020-08-
13-gold
"
+ FDO_DISTRIBUTION_TAG: &arm_build "2020-08-
31-deqp-version
"
.use-arm_build:
variables:
.use-arm_build:
variables:
@@
-357,7
+358,7
@@
arm64_test:
extends:
- .use-arm_test-base
variables:
extends:
- .use-arm_test-base
variables:
- FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-
24-gold
"
+ FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-
31-deqp-version
"
.use-arm64_test:
variables:
.use-arm64_test:
variables:
@@
-1163,6
+1164,11
@@
arm64_a630_gmem:
FD_MESA_DEBUG: nobypass
NIR_VALIDATE: 1
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:
arm64_a630_vk:
extends: arm64_a630_gles2
variables: