Skip to content

Commit 8888ee4

Browse files
author
MarcoFalke
committed
ci: Allow build dir on CI host
1 parent 4036ee3 commit 8888ee4

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,16 +266,16 @@ jobs:
266266
timeout-minutes: 120
267267
env:
268268
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
269-
DANGER_CI_ON_HOST_CACHE_FOLDERS: 1
269+
DANGER_CI_ON_HOST_FOLDERS: 1
270270
steps:
271271
- name: Checkout
272272
uses: actions/checkout@v4
273273

274-
- name: Set Ccache directory
275-
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
276-
277-
- name: Set base root directory
278-
run: echo "BASE_ROOT_DIR=${RUNNER_TEMP}" >> "$GITHUB_ENV"
274+
- name: Set CI directories
275+
run: |
276+
echo "CCACHE_DIR=${{ runner.temp }}/ccache_dir" >> "$GITHUB_ENV"
277+
echo "BASE_ROOT_DIR=${{ runner.temp }}" >> "$GITHUB_ENV"
278+
echo "BASE_BUILD_DIR=${{ runner.temp }}/build-asan" >> "$GITHUB_ENV"
279279
280280
- name: Restore Ccache cache
281281
id: ccache-cache

ci/test/02_run_container.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,21 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
4444
CI_DEPENDS_MOUNT="type=volume,src=${CONTAINER_NAME}_depends,dst=$DEPENDS_DIR/built"
4545
CI_DEPENDS_SOURCES_MOUNT="type=volume,src=${CONTAINER_NAME}_depends_sources,dst=$DEPENDS_DIR/sources"
4646
CI_PREVIOUS_RELEASES_MOUNT="type=volume,src=${CONTAINER_NAME}_previous_releases,dst=$PREVIOUS_RELEASES_DIR"
47+
CI_BUILD_MOUNT=""
4748

48-
if [ "$DANGER_CI_ON_HOST_CACHE_FOLDERS" ]; then
49+
if [ "$DANGER_CI_ON_HOST_FOLDERS" ]; then
4950
# ensure the directories exist
5051
mkdir -p "${CCACHE_DIR}"
5152
mkdir -p "${DEPENDS_DIR}/built"
5253
mkdir -p "${DEPENDS_DIR}/sources"
5354
mkdir -p "${PREVIOUS_RELEASES_DIR}"
55+
mkdir -p "${BASE_BUILD_DIR}" # Unset by default, must be defined externally
5456

5557
CI_CCACHE_MOUNT="type=bind,src=${CCACHE_DIR},dst=$CCACHE_DIR"
5658
CI_DEPENDS_MOUNT="type=bind,src=${DEPENDS_DIR}/built,dst=$DEPENDS_DIR/built"
5759
CI_DEPENDS_SOURCES_MOUNT="type=bind,src=${DEPENDS_DIR}/sources,dst=$DEPENDS_DIR/sources"
5860
CI_PREVIOUS_RELEASES_MOUNT="type=bind,src=${PREVIOUS_RELEASES_DIR},dst=$PREVIOUS_RELEASES_DIR"
61+
CI_BUILD_MOUNT="--mount type=bind,src=${BASE_BUILD_DIR},dst=${BASE_BUILD_DIR}"
5962
fi
6063

6164
if [ "$DANGER_CI_ON_HOST_CCACHE_FOLDER" ]; then
@@ -97,6 +100,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
97100
--mount "${CI_DEPENDS_MOUNT}" \
98101
--mount "${CI_DEPENDS_SOURCES_MOUNT}" \
99102
--mount "${CI_PREVIOUS_RELEASES_MOUNT}" \
103+
${CI_BUILD_MOUNT} \
100104
--env-file /tmp/env-$USER-$CONTAINER_NAME \
101105
--name "$CONTAINER_NAME" \
102106
--network ci-ip6net \

0 commit comments

Comments
 (0)