Skip to content

Commit 1815073

Browse files
committed
wip
1 parent d284be1 commit 1815073

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ jobs:
2020
with:
2121
submodules: recursive
2222
- name: Build and test
23+
env:
24+
CACHE_CONAN_REMOTE: ${{ vars.RELEASE_CONAN_REMOTE }}
25+
CACHE_CONAN_LOGIN_USERNAME: ${{ vars.RELEASE_CONAN_LOGIN_USERNAME }}
26+
CACHE_CONAN_PASSWORD: ${{ secrets.RELEASE_CONAN_PASSWORD }}
2327
run: scripts/ci-build-with-docker.sh
2428
#release:
2529
# if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')

scripts/ci-build-with-docker.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@ PROJECT_DIR=$(realpath $(dirname "${SCRIPT_DIR}"))
1414
ROOT_IMAGE=registry.gitlab.com/batteriesincluded/batt-docker/batteries-debian12-build-tools:0.5.0
1515
USER_IMAGE=$(cor docker user-image ${ROOT_IMAGE})
1616

17-
if [ -f "${GITHUB_ENV:-noSuchFile}" ]; then
18-
ENV_FILE_FLAGS="--env-file ${GITHUB_ENV}"
19-
cat "${GITHUB_ENV}"
20-
fi
21-
2217
docker run \
2318
--ulimit memlock=-1:-1 \
2419
--cap-add SYS_ADMIN \
2520
--privileged \
2621
--network host \
27-
${ENV_FILE_FLAGS:-} \
22+
--env CACHE_CONAN_REMOTE \
23+
--env CACHE_CONAN_LOGIN_USERNAME \
24+
--env CACHE_CONAN_PASSWORD \
2825
--volume "${HOME}/ci_conan_hosts:/etc/hosts:ro" \
2926
--volume "${PROJECT_DIR}:${PROJECT_DIR}" \
3027
--workdir "${PROJECT_DIR}" \

0 commit comments

Comments
 (0)