From 8b6bf5b8f937ead28d4bd288a85f907607e1f5ea Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Tue, 20 Feb 2024 02:52:20 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix=20(build):=20Add=20(initial)=20missing?= =?UTF-8?q?=20CI=20test=20coverage=20for=20DevEnv=20=F0=9F=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yaml | 7 ++++++- devenv.bash | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index abd4dc355..75d3c4934 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -122,7 +122,12 @@ jobs: shell: bash run: asdf reshim - - run: ./tools/test-ci/test.bash + - name: Run CI Tests + run: ./tools/test-ci/test.bash + + # TODO https://github.com/enola-dev/enola/issues/458 turn this "upside down"... + - name: Test Development Environment (DevEnv) + run: ./devenv.bash # Build docs/ into site/ (not just on main branch but also for pull requests, as test) - name: Build Docs Site diff --git a/devenv.bash b/devenv.bash index ccfa4f216..81efa34ab 100755 --- a/devenv.bash +++ b/devenv.bash @@ -21,4 +21,8 @@ set -euo pipefail docker build -t enola.dev-devenv --rm -f Dockerfile-DevEnv . -docker run -v .:/workspace/:Z -it --rm enola.dev-devenv +set +u +if [ -z "$CI" ]; then + docker run -v "$PWD":/workspace/:Z -it --rm enola.dev-devenv +fi +set -u From b22439cb1bb4a1d0df66a45042d796497da0cc94 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Wed, 21 Feb 2024 23:09:38 +0100 Subject: [PATCH 2/2] =?UTF-8?q?fix=20(build):=20Cache=20DevEnv=20?= =?UTF-8?q?=F0=9F=AB=99=20on=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devenv.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv.bash b/devenv.bash index 81efa34ab..17e88f30d 100755 --- a/devenv.bash +++ b/devenv.bash @@ -19,7 +19,7 @@ set -euo pipefail # This script builds the project using containers technology (AKA "Docker"). -docker build -t enola.dev-devenv --rm -f Dockerfile-DevEnv . +docker buildx build -t enola.dev-devenv --rm -f Dockerfile-DevEnv --cache-to type=gha --cache-from . set +u if [ -z "$CI" ]; then