util/os_misc: os_get_available_system_memory() for OpenBSD

[mesa.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35593d7909f6881874a8c678f4e4cec4e43d6a2a..1215315dfbaeadfafd444982803c627f960b94c1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,7 +126,8 @@ success:
       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:
@@ -295,13 +296,13 @@ x86_test-base:
 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:
-    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:
@@ -323,7 +324,7 @@ arm_build:
     - .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:
@@ -356,7 +357,7 @@ arm64_test:
   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:
@@ -1162,6 +1163,11 @@ arm64_a630_gmem:
     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: