Mesa (master): ci: prepare-artifacts: Make the indent here match previously in the file

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Feb 22 00:34:42 UTC 2020


Module: Mesa
Branch: master
Commit: 985343e71aeed5f68697b440e9bcc2dc6a51bc2f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=985343e71aeed5f68697b440e9bcc2dc6a51bc2f

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jan 30 15:20:35 2020 -0800

ci: prepare-artifacts: Make the indent here match previously in the file

Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3883>

---

 .gitlab-ci/prepare-artifacts.sh | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
index f6a3f1beee4..e0c0eb8cb8a 100755
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -36,27 +36,27 @@ tar -cf artifacts/install.tar install
 
 # If the container has LAVA stuff, prepare the artifacts for LAVA jobs
 if [ -d /lava-files ]; then
-        # Copy kernel and device trees for LAVA
-        cp /lava-files/*Image artifacts/.
-        cp /lava-files/*.dtb artifacts/.
+    # Copy kernel and device trees for LAVA
+    cp /lava-files/*Image artifacts/.
+    cp /lava-files/*.dtb artifacts/.
 
-        # Pack ramdisk for LAVA
-        mkdir -p /lava-files/rootfs-${CROSS:-arm64}/mesa
-        cp -a install/* /lava-files/rootfs-${CROSS:-arm64}/mesa/.
+    # Pack ramdisk for LAVA
+    mkdir -p /lava-files/rootfs-${CROSS:-arm64}/mesa
+    cp -a install/* /lava-files/rootfs-${CROSS:-arm64}/mesa/.
 
-        cp .gitlab-ci/deqp-runner.sh /lava-files/rootfs-${CROSS:-arm64}/deqp/.
-        cp .gitlab-ci/deqp-*-fails.txt /lava-files/rootfs-${CROSS:-arm64}/deqp/.
-        cp .gitlab-ci/deqp-*-skips.txt /lava-files/rootfs-${CROSS:-arm64}/deqp/.
-        find /lava-files/rootfs-${CROSS:-arm64}/ -type f -printf "%s\t%i\t%p\n" | sort -n | tail -100
+    cp .gitlab-ci/deqp-runner.sh /lava-files/rootfs-${CROSS:-arm64}/deqp/.
+    cp .gitlab-ci/deqp-*-fails.txt /lava-files/rootfs-${CROSS:-arm64}/deqp/.
+    cp .gitlab-ci/deqp-*-skips.txt /lava-files/rootfs-${CROSS:-arm64}/deqp/.
+    find /lava-files/rootfs-${CROSS:-arm64}/ -type f -printf "%s\t%i\t%p\n" | sort -n | tail -100
 
-        pushd /lava-files/rootfs-${CROSS:-arm64}/
-        find -H  |  cpio -H newc -o | gzip -c - > $CI_PROJECT_DIR/artifacts/lava-rootfs-${CROSS:-arm64}.cpio.gz
-        popd
+    pushd /lava-files/rootfs-${CROSS:-arm64}/
+    find -H  |  cpio -H newc -o | gzip -c - > $CI_PROJECT_DIR/artifacts/lava-rootfs-${CROSS:-arm64}.cpio.gz
+    popd
 
-        # Store job ID so the test stage can build URLs to the artifacts
-        echo $CI_JOB_ID > artifacts/build_job_id.txt
+    # Store job ID so the test stage can build URLs to the artifacts
+    echo $CI_JOB_ID > artifacts/build_job_id.txt
 
-        # Pass needed files to the test stage
-        cp $CI_PROJECT_DIR/.gitlab-ci/generate_lava.py artifacts/.
-        cp $CI_PROJECT_DIR/.gitlab-ci/lava-deqp.yml.jinja2 artifacts/.
+    # Pass needed files to the test stage
+    cp $CI_PROJECT_DIR/.gitlab-ci/generate_lava.py artifacts/.
+    cp $CI_PROJECT_DIR/.gitlab-ci/lava-deqp.yml.jinja2 artifacts/.
 fi



More information about the mesa-commit mailing list