diff options
| author | Rob Clark <robdclark@chromium.org> | 2020-09-02 15:43:20 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-09-29 19:58:50 +0000 |
| commit | 8abe3bb95a869182ada6b75952a059c060766afa (patch) | |
| tree | 08afc47c687beb8f8971ec8d07212d76a259d761 | |
| parent | aee1c08c06567a7c83f97f3e736dec4bb0008403 (diff) | |
ci: cherry-pick deqp fix for config choosing
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6553>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/build-deqp.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f2b55a8e40..54b4f9cbf5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -391,7 +391,7 @@ arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm64_test "2020-09-04-pagetables" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-09-28-deqp-surfaceless-fix" .use-arm64_test: variables: diff --git a/.gitlab-ci/build-deqp.sh b/.gitlab-ci/build-deqp.sh index a8163c20ab5..ca749f4e9e8 100644 --- a/.gitlab-ci/build-deqp.sh +++ b/.gitlab-ci/build-deqp.sh @@ -11,6 +11,11 @@ git clone \ /VK-GL-CTS pushd /VK-GL-CTS +# cherry-pick fix for surfaceless config choosing: +git fetch origin master +git cherry-pick -x 8f3bfc6c7def0c0cb452d5dadf31aa7fef242365 + + # --insecure is due to SSL cert failures hitting sourceforge for zlib and # libpng (sigh). The archives get their checksums checked anyway, and git # always goes through ssh or https. |