mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-07-16 15:57:19 +00:00
Code Issues Projects Releases Wiki Activity

CI: add KAS_BUILD_DIR variable

Browse Source 
Instead of always using KAS_WORK_DIR/build to refer to the build tree,
on the assumption that is where the build tree is, export KAS_BUILD_DIR
and use that variable instead.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2024-09-27 16:57:03 +01:00
committed by Jon Mason
parent 7eac705805
commit d96bebfded
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+6 -5
View File
@@ -34,13 +34,14 @@ stages:
interruptible: true interruptible: true
variables: variables:
KAS_WORK_DIR: $CI_PROJECT_DIR/work KAS_WORK_DIR: $CI_PROJECT_DIR/work
KAS_BUILD_DIR: $KAS_WORK_DIR/build
KAS_REPO_REF_DIR: $CACHE_DIR/repos KAS_REPO_REF_DIR: $CACHE_DIR/repos
SSTATE_DIR: $CACHE_DIR/sstate SSTATE_DIR: $CACHE_DIR/sstate
DL_DIR: $CACHE_DIR/downloads DL_DIR: $CACHE_DIR/downloads
BB_LOGCONFIG: $CI_PROJECT_DIR/ci/logging.yml BB_LOGCONFIG: $CI_PROJECT_DIR/ci/logging.yml
TOOLCHAIN_DIR: $CACHE_DIR/toolchains TOOLCHAIN_DIR: $CACHE_DIR/toolchains
IMAGE_DIR: $CI_PROJECT_DIR/work/build/tmp/deploy/images IMAGE_DIR: $KAS_BUILD_DIR/tmp/deploy/images
TOOLCHAIN_LINK_DIR: $CI_PROJECT_DIR/work/build/toolchains TOOLCHAIN_LINK_DIR: $KAS_BUILD_DIR/toolchains
before_script: before_script:
- echo KAS_WORK_DIR = $KAS_WORK_DIR - echo KAS_WORK_DIR = $KAS_WORK_DIR
- echo SSTATE_DIR = $SSTATE_DIR - echo SSTATE_DIR = $SSTATE_DIR
@@ -75,13 +76,13 @@ stages:
- echo KASFILES=$KASFILES - echo KASFILES=$KASFILES
- kas dump --update --force-checkout --resolve-refs --resolve-env $KASFILES - kas dump --update --force-checkout --resolve-refs --resolve-env $KASFILES
- kas build $KASFILES - kas build $KASFILES
- ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log - ./ci/check-warnings $KAS_BUILD_DIR/warnings.log
artifacts: artifacts:
name: "logs" name: "logs"
when: always when: always
paths: paths:
- $CI_PROJECT_DIR/work/build/tmp*/work*/**/temp/log.do_*.* - $KAS_BUILD_DIR/tmp*/work*/**/temp/log.do_*.*
- $CI_PROJECT_DIR/work/build/tmp*/work*/**/testimage/* - $KAS_BUILD_DIR/tmp*/work*/**/testimage/*
# #
# Prep stage, update repositories once. # Prep stage, update repositories once.