summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2019-10-23 18:42:53 +0200
committerMichel Dänzer <michel@daenzer.net>2019-11-12 10:14:26 +0100
commit59fcb019d02804f721477cac11fa6c23f1850ef1 (patch)
treed3ffc761596d4656f9ddb91e8f0678fb17269614 /.gitlab-ci
parent2921a38484b2d390158f6844f1654b787900226e (diff)
gitlab-ci: Move artifact preparation to separate script
It's currently only needed for the meson-main and meson-arm64 jobs, not the other meson build jobs. Also remove MESON_SHADERDB, just run .gitlab-ci/run-shader-db.sh directly from the meson-main job. v2: * Also run prepare-artifacts.sh in meson-arm64 script v3: * Move tarball creation into the new script as well, as it prevented ccache --show-stats from running in after_script Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> # v1 Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to '.gitlab-ci')
-rwxr-xr-x.gitlab-ci/meson-build.sh25
-rwxr-xr-x.gitlab-ci/prepare-artifacts.sh29
2 files changed, 29 insertions, 25 deletions
diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
index d56e526ef20..b618f45a2c2 100755
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -62,28 +62,3 @@ ninja -j4
LC_ALL=C.UTF-8 ninja test
ninja install
cd ..
-
-if test -n "$MESON_SHADERDB"; then
- ./.gitlab-ci/run-shader-db.sh;
-fi
-
-# Delete 2MB of includes from artifacts.
-rm -rf install/include
-
-# Strip the drivers in the artifacts to cut 80% of the artifacts size.
-if [ -n "$CROSS" ]; then
- STRIP=`sed -n -E "s/strip\s*=\s*'(.*)'/\1/p" "$CROSS_FILE"`
- if [ -z "$STRIP" ]; then
- echo "Failed to find strip command in cross file"
- exit 1
- fi
-else
- STRIP="strip"
-fi
-find install -name \*.so -exec $STRIP {} \;
-
-# Test runs don't pull down the git tree, so put the dEQP helper
-# script and associated bits there.
-mkdir -p artifacts/
-cp -Rp .gitlab-ci/deqp* artifacts/
-# cp -Rp src/freedreno/ci/expected* artifacts/
diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
new file mode 100755
index 00000000000..6df00da434e
--- /dev/null
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+# Delete 2MB of includes from artifacts.
+rm -rf install/include
+
+# Strip the drivers in the artifacts to cut 80% of the artifacts size.
+if [ -n "$CROSS" ]; then
+ STRIP=`sed -n -E "s/strip\s*=\s*'(.*)'/\1/p" "$CROSS_FILE"`
+ if [ -z "$STRIP" ]; then
+ echo "Failed to find strip command in cross file"
+ exit 1
+ fi
+else
+ STRIP="strip"
+fi
+find install -name \*.so -exec $STRIP {} \;
+
+# Test runs don't pull down the git tree, so put the dEQP helper
+# script and associated bits there.
+mkdir -p artifacts/
+cp -Rp .gitlab-ci/deqp* artifacts/
+# cp -Rp src/freedreno/ci/expected* artifacts/
+
+# Tar up the install dir so that symlinks and hardlinks aren't each
+# packed separately in the zip file.
+tar -cf artifacts/install.tar install