diff options
| -rw-r--r-- | .gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 4 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_build_old.sh | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e4290d3a26..a2343ed6e38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,7 +137,7 @@ x86_build: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-05-19" + FDO_DISTRIBUTION_TAG: &x86_build "2020-05-29" .use-x86_build: variables: @@ -179,7 +179,7 @@ x86_test-vk: x86_build_old: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_build_old "2020-04-27" + FDO_DISTRIBUTION_TAG: &x86_build_old "2020-06-02" FDO_DISTRIBUTION_VERSION: stretch-slim .use-x86_build_old: @@ -483,6 +483,7 @@ meson-clover: -D glx=disabled -D egl=disabled -D gbm=disabled + GALLIUM_DRIVERS: "r600,radeonsi" GALLIUM_ST: > -D dri3=disabled -D gallium-vdpau=disabled @@ -493,12 +494,8 @@ meson-clover: -D gallium-nine=false -D gallium-opencl=icd script: - - export GALLIUM_DRIVERS="r600,radeonsi" - .gitlab-ci/meson-build.sh - LLVM_VERSION=8 .gitlab-ci/meson-build.sh - - export GALLIUM_DRIVERS="i915,r600" - - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh - - LLVM_VERSION=7 .gitlab-ci/meson-build.sh meson-clover-old-llvm: extends: @@ -516,6 +513,8 @@ meson-clover-old-llvm: - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh - LLVM_VERSION=4.0 .gitlab-ci/meson-build.sh - LLVM_VERSION=5.0 .gitlab-ci/meson-build.sh + - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh + - LLVM_VERSION=7 .gitlab-ci/meson-build.sh meson-vulkan: extends: .meson-build diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index e44dbab3c8d..fe8eb33f01a 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -48,8 +48,6 @@ apt-get install -y --no-remove \ gcc \ gettext \ git \ - libclang-6.0-dev \ - libclang-7-dev \ libclang-9-dev \ libclc-dev \ libdrm-dev:s390x \ @@ -77,8 +75,6 @@ apt-get install -y --no-remove \ libxshmfence-dev \ libxvmc-dev \ libxxf86vm-dev \ - llvm-6.0-dev \ - llvm-7-dev \ llvm-9-dev \ pkg-config \ python-mako \ diff --git a/.gitlab-ci/container/x86_build_old.sh b/.gitlab-ci/container/x86_build_old.sh index 42b00693f45..4f9c83b05f4 100644 --- a/.gitlab-ci/container/x86_build_old.sh +++ b/.gitlab-ci/container/x86_build_old.sh @@ -35,6 +35,8 @@ apt-get install -y --no-remove \ libclang-3.9-dev \ libclang-4.0-dev \ libclang-5.0-dev \ + libclang-6.0-dev \ + libclang-7-dev \ libclc-dev \ libdrm-dev \ libelf-dev \ @@ -45,6 +47,8 @@ apt-get install -y --no-remove \ llvm-3.9-dev \ llvm-4.0-dev \ llvm-5.0-dev \ + llvm-6.0-dev \ + llvm-7-dev \ ninja-build \ pkg-config \ python-mako \ |