projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nir: Allow uniform in nir_lower_vars_to_explicit_types
[mesa.git]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index 13a9caecd6a4dfdc2e01a1bc0e8db111a854d281..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
@@
-119,14
+120,15
@@
success:
image: debian:stable-slim
rules:
- *ignore_scheduled_pipelines
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: 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:
variables:
GIT_STRATEGY: none
script:
@@
-295,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:
@@
-323,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:
@@
-356,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:
@@
-1162,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: