ci: Use CI_PROJECT_NAME instead of hardcoding 'mesa'
This can make it more convenient for other projects to reuse these scripts. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Reviewed-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15891>
This commit is contained in:
parent
3394680368
commit
f7713b0af0
|
@ -10,7 +10,7 @@ fi
|
||||||
|
|
||||||
export CCACHE_COMPILERCHECK=content
|
export CCACHE_COMPILERCHECK=content
|
||||||
export CCACHE_COMPRESS=true
|
export CCACHE_COMPRESS=true
|
||||||
export CCACHE_DIR=/cache/mesa/ccache
|
export CCACHE_DIR=/cache/$CI_PROJECT_NAME/ccache
|
||||||
export PATH=$CCACHE_PATH:$PATH
|
export PATH=$CCACHE_PATH:$PATH
|
||||||
|
|
||||||
# CMake ignores $PATH, so we have to force CC/GCC to the ccache versions.
|
# CMake ignores $PATH, so we have to force CC/GCC to the ccache versions.
|
||||||
|
|
|
@ -5,7 +5,7 @@ set -o xtrace
|
||||||
|
|
||||||
# if we run this script outside of gitlab-ci for testing, ensure
|
# if we run this script outside of gitlab-ci for testing, ensure
|
||||||
# we got meaningful variables
|
# we got meaningful variables
|
||||||
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(mktemp -d)/mesa}
|
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(mktemp -d)/$CI_PROJECT_NAME}
|
||||||
|
|
||||||
if [[ -e $CI_PROJECT_DIR/.git ]]
|
if [[ -e $CI_PROJECT_DIR/.git ]]
|
||||||
then
|
then
|
||||||
|
@ -16,8 +16,8 @@ fi
|
||||||
TMP_DIR=$(mktemp -d)
|
TMP_DIR=$(mktemp -d)
|
||||||
|
|
||||||
echo "Downloading archived master..."
|
echo "Downloading archived master..."
|
||||||
/usr/bin/wget -O $TMP_DIR/mesa.tar.gz \
|
/usr/bin/wget -O $TMP_DIR/$CI_PROJECT_NAME.tar.gz \
|
||||||
https://${MINIO_HOST}/git-cache/${FDO_UPSTREAM_REPO}/mesa.tar.gz
|
https://${MINIO_HOST}/git-cache/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz
|
||||||
|
|
||||||
# check wget error code
|
# check wget error code
|
||||||
if [[ $? -ne 0 ]]
|
if [[ $? -ne 0 ]]
|
||||||
|
@ -31,6 +31,6 @@ set -e
|
||||||
rm -rf "$CI_PROJECT_DIR"
|
rm -rf "$CI_PROJECT_DIR"
|
||||||
echo "Extracting tarball into '$CI_PROJECT_DIR'..."
|
echo "Extracting tarball into '$CI_PROJECT_DIR'..."
|
||||||
mkdir -p "$CI_PROJECT_DIR"
|
mkdir -p "$CI_PROJECT_DIR"
|
||||||
tar xzf "$TMP_DIR/mesa.tar.gz" -C "$CI_PROJECT_DIR"
|
tar xzf "$TMP_DIR/$CI_PROJECT_NAME.tar.gz" -C "$CI_PROJECT_DIR"
|
||||||
rm -rf "$TMP_DIR"
|
rm -rf "$TMP_DIR"
|
||||||
chmod a+w "$CI_PROJECT_DIR"
|
chmod a+w "$CI_PROJECT_DIR"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
BASE_SYSTEM_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${DISTRIBUTION_TAG}/${ARCH}"
|
BASE_SYSTEM_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${DISTRIBUTION_TAG}/${ARCH}"
|
||||||
BASE_SYSTEM_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}"
|
BASE_SYSTEM_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}"
|
||||||
# per-job build artifacts
|
# per-job build artifacts
|
||||||
MESA_BUILD_PATH: "${PIPELINE_ARTIFACTS_BASE}/mesa-${ARCH}.tar.gz"
|
MESA_BUILD_PATH: "${PIPELINE_ARTIFACTS_BASE}/${CI_PROJECT_NAME}-${ARCH}.tar.gz"
|
||||||
JOB_ROOTFS_OVERLAY_PATH: "${JOB_ARTIFACTS_BASE}/job-rootfs-overlay.tar.gz"
|
JOB_ROOTFS_OVERLAY_PATH: "${JOB_ARTIFACTS_BASE}/job-rootfs-overlay.tar.gz"
|
||||||
JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.gz"
|
JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.gz"
|
||||||
MINIO_RESULTS_UPLOAD: "${JOB_ARTIFACTS_BASE}"
|
MINIO_RESULTS_UPLOAD: "${JOB_ARTIFACTS_BASE}"
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
script:
|
script:
|
||||||
- ./artifacts/lava/lava-submit.sh
|
- ./artifacts/lava/lava-submit.sh
|
||||||
artifacts:
|
artifacts:
|
||||||
name: "mesa_${CI_JOB_NAME}"
|
name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
|
||||||
when: always
|
when: always
|
||||||
paths:
|
paths:
|
||||||
- results/
|
- results/
|
||||||
|
|
Loading…
Reference in New Issue