Module: Mesa Branch: master Commit: 5f6f84bf81921f28fcb07f7726c28871942d8b5d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f6f84bf81921f28fcb07f7726c28871942d8b5d
Author: Andres Gomez <[email protected]> Date: Wed Nov 11 21:29:46 2020 +0200 ci: move general build commands to their own section The STRIP_CMD env var is used in several build scripts, not just by dEQP. Also, we want to have the rootfs destination directory created so it also exists for builds that only move directory trees in there. Signed-off-by: Andres Gomez <[email protected]> Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388> --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/container/lava_build.sh | 8 ++++++-- .gitlab-ci/lava-gitlab-ci.yml | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 526414850f4..f06391ff1d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -408,7 +408,7 @@ arm64_test: extends: - .use-arm_test-base variables: - MESA_IMAGE_TAG: &arm64_test "2020-12-17-fdo-upstream-repo" + MESA_IMAGE_TAG: &arm64_test "2020-12-18-lava" .use-arm64_test: variables: @@ -422,7 +422,7 @@ armhf_test: extends: - .use-arm_test-base variables: - MESA_IMAGE_TAG: &armhf_test "2020-12-17-fdo-upstream-repo" + MESA_IMAGE_TAG: &armhf_test "2020-12-18-lava" .use-armhf_test: variables: diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index a4a6661cfe6..62c0bcd1c43 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -97,15 +97,19 @@ if [[ "$DEBIAN_ARCH" = "armhf" ]]; then qtbase5-dev:armhf fi -############### Build dEQP runner +############### Building +STRIP_CMD="${GCC_ARCH}-strip" +mkdir -p /lava-files/rootfs-${DEBIAN_ARCH} + + +############### Build dEQP runner . .gitlab-ci/build-deqp-runner.sh mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin mv /usr/local/bin/deqp-runner /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/. ############### Build dEQP -STRIP_CMD="${GCC_ARCH}-strip" DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/. diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index f5e635c5191..79784e2f2e0 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - DISTRIBUTION_TAG: "2020-12-17-fdo-upstream-repo" + DISTRIBUTION_TAG: "2020-12-18-lava" .kernel+rootfs: stage: container-2 _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
