ci: make sure we only read the first line from install/VERSION
Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Martin Peres <martin.peres@mupuf.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10856>
This commit is contained in:
parent
683ddf19dc
commit
763b557262
|
@ -15,7 +15,7 @@ export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
|
|||
|
||||
# Sanity check to ensure that our environment is sufficient to make our tests
|
||||
# run against the Mesa built by CI, rather than any installed distro version.
|
||||
MESA_VERSION=$(cat "$INSTALL/VERSION" | sed 's/\./\\./g')
|
||||
MESA_VERSION=$(head -1 "$INSTALL/VERSION" | sed 's/\./\\./g')
|
||||
|
||||
print_red() {
|
||||
RED='\033[0;31m'
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
set -e
|
||||
set -o xtrace
|
||||
|
||||
VERSION=`cat install/VERSION`
|
||||
VERSION=`head -1 install/VERSION`
|
||||
|
||||
if [ -d results ]; then
|
||||
cd results && rm -rf ..?* .[!.]* *
|
||||
|
|
|
@ -24,7 +24,7 @@ fi
|
|||
|
||||
# Test runs don't pull down the git tree, so put the dEQP helper
|
||||
# script and associated bits there.
|
||||
echo "$(cat VERSION) (git-$(git rev-parse HEAD | cut -b -10))" >> install/VERSION
|
||||
echo "$(cat VERSION) (git-$(git rev-parse HEAD | cut -b -10))" > install/VERSION
|
||||
cp -Rp .gitlab-ci/bare-metal install/
|
||||
cp -Rp .gitlab-ci/common install/
|
||||
cp -Rp .gitlab-ci/piglit install/
|
||||
|
|
Loading…
Reference in New Issue