diff options
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rwxr-xr-x | .gitlab-ci/meson-build.sh | 25 | ||||
| -rwxr-xr-x | .gitlab-ci/prepare-artifacts.sh | 29 |
3 files changed, 36 insertions, 32 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2882e449ff7..ceb78f363fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -161,12 +161,6 @@ debian-10-test:arm64: - ccache --zero-stats || true - ccache --show-stats || true after_script: - # In case the install dir is being saved as artifacts, tar it up - # so that symlinks and hardlinks aren't each packed separately in - # the zip file. - - if [ -d install ]; then - tar -cf artifacts/install.tar install; - fi - export CCACHE_DIR="$PWD/ccache" - ccache --show-stats @@ -222,8 +216,11 @@ meson-main: EXTRA_OPTION: > -D osmesa=gallium -D tools=all - MESON_SHADERDB: "true" BUILDTYPE: "debugoptimized" + script: + - .gitlab-ci/meson-build.sh + - .gitlab-ci/run-shader-db.sh + - .gitlab-ci/prepare-artifacts.sh .meson-cross: extends: @@ -270,6 +267,9 @@ meson-arm64: - .ci-deqp-artifacts variables: BUILDTYPE: "debugoptimized" + script: + - .gitlab-ci/meson-build.sh + - .gitlab-ci/prepare-artifacts.sh # NOTE: Building SWR is 2x (yes two) times slower than all the other # gallium drivers combined. 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 |