From bc79e5c4373a4fdd3ee1c2852177b7d83fafe9a3 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 10 Sep 2019 18:56:19 +0100 Subject: panfrost/ci: Use releases for Volt dEQP So we can better correlate different results to versions of the runner. Signed-off-by: Tomeu Vizoso --- src/gallium/drivers/panfrost/ci/debian-install.sh | 8 +++++--- src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/drivers/panfrost/ci/debian-install.sh b/src/gallium/drivers/panfrost/ci/debian-install.sh index dead65fe74d..91bc58cbc46 100644 --- a/src/gallium/drivers/panfrost/ci/debian-install.sh +++ b/src/gallium/drivers/panfrost/ci/debian-install.sh @@ -130,13 +130,15 @@ rm -rf /battery mkdir -p /volt cd /volt -git clone --depth=1 https://github.com/VoltLang/Watt.git -git clone --depth=1 https://github.com/VoltLang/Volta.git --branch go-go-gadget-armhf -git clone --depth=1 https://github.com/Wallbraker/dEQP.git +mkdir -p Watt Volta dEQP +wget -qO- https://github.com/VoltLang/Watt/archive/v0.1.3.tar.gz | tar -xz --strip-components=1 -C ./Watt +wget -qO- https://github.com/VoltLang/Volta/archive/v0.1.3.tar.gz | tar -xz --strip-components=1 -C ./Volta +wget -qO- https://github.com/Wallbraker/dEQP/archive/v0.1.4.tar.gz | tar -xz --strip-components=1 -C ./dEQP battery config --release --lto Volta Watt battery build battery config --arch ${VOLT_ARCH} --cmd-volta Volta/volta Volta/rt Watt dEQP battery build +rm /usr/local/bin/battery cp dEQP/deqp /artifacts/rootfs/deqp/deqp-volt rm -rf /volt diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml index 10fbb7ea6fc..95e8db98017 100644 --- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml +++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml @@ -16,7 +16,7 @@ variables: UPSTREAM_REPO: mesa/mesa DEBIAN_VERSION: testing-slim - IMAGE_TAG: "2019-09-10-2" + IMAGE_TAG: "2019-09-10-3" include: - project: 'wayland/ci-templates' -- cgit v1.2.3