Skip to content

Commit 2f20c29

Browse files
committed
- Maybe maybe fix CI
1 parent eb9ee0e commit 2f20c29

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ platforms:
6060
script_location: toolchain/ci
6161
template_location: toolchain/cmake/Templates
6262
version:
63-
hotfix: 4
63+
hotfix: 5
6464
major: 0
6565
minor: 3
6666
patch: 0

cb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@ case $1 in
3030
fi
3131
;;
3232
"ci-build")
33-
mkdir -p build
34-
pushd build
33+
pushd /build/build
3534
export GENERATE_PROGRAMS=${GENERATE_PROGRAMS:-ON}
3635
export CONFIGURATION=${CONFIGURATION:-Debug}
3736
export CMAKE_SOURCE_DIR=${BASE_DIR}
38-
export CMAKE_INSTALL_DIR=$(realpath .)/install
37+
export CMAKE_INSTALL_DIR=/build/install
3938
cmake -C${BASE_DIR}/.github/cmake/${BUILDVARIANT}.preload.cmake ${BASE_DIR} ${@:2}
4039
cmake --build . --target ${BUILD_TARGET:-all}
4140
cmake --build . --target install
@@ -46,24 +45,25 @@ case $1 in
4645
source ${BASE_DIR}/.github/cmake/select/${BUILDVARIANT}.sh
4746
fi
4847
docker run --rm \
49-
-v ${BASE_DIR}:/build \
48+
-v ${BASE_DIR}:/build/src \
49+
-v $(realpath .)/build:/build/build \
50+
-v $(realpath .)/install:/build/install \
5051
-e BUILDVARIANT=${BUILDVARIANT} \
5152
-e CONFIGURATION=${CONFIGURATION} \
5253
-e GENERATE_PROGRAMS=${GENERATE_PROGRAMS} \
5354
-e BUILD_TARGET=${BUILD_TARGET:-all} \
5455
-u root \
55-
${CONTAINER} /build/cb ci-build ${@:2}
56+
${CONTAINER} /build/src/cb ci-build ${@:2}
5657
;;
5758
"compress-usr-dir")
5859
OUTPUT=$(realpath .)/${2}_${BUILDVARIANT}.tar.bz2
59-
INSTALL_DIR=$(realpath .)/build/install/${BUILDVARIANT}
60+
INSTALL_DIR=$(realpath .)/install
6061

6162
echo "Creating $OUTPUT from $INSTALL_DIR"
6263

6364
pwd
6465
ls $(realpath .)/build
65-
ls $(realpath .)/build/install
66-
ls $(realpath .)/build/install/${BUILDVARIANT}
66+
ls $(realpath .)/install
6767
ls ${INSTALL_DIR}
6868
ls -R
6969

0 commit comments

Comments
 (0)