projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nir: Add a new nir_var_mem_constant variable mode
[mesa.git]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index 5bca218fd26c49857312f104d321ea9859399f1f..3fea645d4140eaa5735e71362401773805f9da74 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-70,11
+70,12
@@
test-docs:
stage: container+docs
rules:
- *ignore_scheduled_pipelines
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'
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
- changes: *docs-or-ci
when: manual
# Other cases default to never
@@
-118,14
+119,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:
@@
-204,7
+206,7
@@
x86_build-base:
- .fdo.container-build@debian
- .container
variables:
- .fdo.container-build@debian
- .container
variables:
- FDO_DISTRIBUTION_TAG: &x86_build-base "2020-0
7-28-x86-2
"
+ FDO_DISTRIBUTION_TAG: &x86_build-base "2020-0
8-13-gold
"
.use-x86_build-base:
extends:
.use-x86_build-base:
extends:
@@
-222,7
+224,7
@@
x86_build:
extends:
- .use-x86_build-base
variables:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_build "2020-08-
08-glvn
d"
+ FDO_DISTRIBUTION_TAG: &x86_build "2020-08-
13-gol
d"
.use-x86_build:
variables:
.use-x86_build:
variables:
@@
-236,7
+238,7
@@
i386_build:
extends:
- .use-x86_build-base
variables:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &i386_build "2020-0
7-28-x86-2
"
+ FDO_DISTRIBUTION_TAG: &i386_build "2020-0
8-13-gold
"
.use-i386_build:
variables:
.use-i386_build:
variables:
@@
-250,7
+252,7
@@
ppc64el_build:
extends:
- .use-x86_build-base
variables:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-0
7-28-x86-2
"
+ FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-0
8-13-gold
"
.use-ppc64el_build:
variables:
.use-ppc64el_build:
variables:
@@
-264,7
+266,7
@@
s390x_build:
extends:
- .use-x86_build-base
variables:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &s390x_build "2020-0
7-28-x86-2
"
+ FDO_DISTRIBUTION_TAG: &s390x_build "2020-0
8-13-gold
"
.use-s390x_build:
variables:
.use-s390x_build:
variables:
@@
-277,7
+279,7
@@
s390x_build:
x86_test-base:
extends: x86_build-base
variables:
x86_test-base:
extends: x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-base "2020-0
7-28-x86-2
"
+ FDO_DISTRIBUTION_TAG: &x86_test-base "2020-0
8-13-gold
"
.use-x86_test-base:
extends:
.use-x86_test-base:
extends:
@@
-294,19
+296,19
@@
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-
14-xcb-shm
"
+ FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-08-
24-gold
"
# 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-0
7-28-x86-2
"
+ FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-0
8-13-gold
"
# Debian 9 based x86 build image (old LLVM)
x86_build_old:
extends: x86_build-base
variables:
# Debian 9 based x86 build image (old LLVM)
x86_build_old:
extends: x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_build_old "2020-0
7-28-x86-2
"
+ FDO_DISTRIBUTION_TAG: &x86_build_old "2020-0
8-13-gold
"
FDO_DISTRIBUTION_VERSION: stretch-slim
.use-x86_build_old:
FDO_DISTRIBUTION_VERSION: stretch-slim
.use-x86_build_old:
@@
-322,7
+324,7
@@
arm_build:
- .fdo.container-build@debian@arm64v8
- .container
variables:
- .fdo.container-build@debian@arm64v8
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_build "2020-08-
04-nfs-2
"
+ FDO_DISTRIBUTION_TAG: &arm_build "2020-08-
13-gold
"
.use-arm_build:
variables:
.use-arm_build:
variables:
@@
-337,7
+339,7
@@
arm_test-base:
- .fdo.container-build@debian
- .container
variables:
- .fdo.container-build@debian
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_test-base "2020-0
7-28-libdrm
"
+ FDO_DISTRIBUTION_TAG: &arm_test-base "2020-0
8-13-gold
"
.use-arm_test-base:
extends:
.use-arm_test-base:
extends:
@@
-355,7
+357,7
@@
arm64_test:
extends:
- .use-arm_test-base
variables:
extends:
- .use-arm_test-base
variables:
- FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-
18
"
+ FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-
24-gold
"
.use-arm64_test:
variables:
.use-arm64_test:
variables: