OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: make sure we only read the first line from install/VERSION

Browse Source 
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:
Andres Gomez
2021-05-05 10:10:44 +03:00
committed by Marge Bot
parent 683ddf19dc
commit 763b557262
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/piglit/run.sh
View File

@@ -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 # 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. # 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() { print_red() {
RED='\033[0;31m' RED='\033[0;31m'

2
.gitlab-ci/piglit/run_cl.sh
View File

@@ -3,7 +3,7 @@
set -e set -e
set -o xtrace set -o xtrace
VERSION=`cat install/VERSION` VERSION=`head -1 install/VERSION`
if [ -d results ]; then if [ -d results ]; then
cd results && rm -rf ..?* .[!.]* * cd results && rm -rf ..?* .[!.]* *

2
.gitlab-ci/prepare-artifacts.sh
View File

@@ -24,7 +24,7 @@ fi
# Test runs don't pull down the git tree, so put the dEQP helper # Test runs don't pull down the git tree, so put the dEQP helper
# script and associated bits there. # 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/bare-metal install/
cp -Rp .gitlab-ci/common install/ cp -Rp .gitlab-ci/common install/
cp -Rp .gitlab-ci/piglit install/ cp -Rp .gitlab-ci/piglit install/