From c5b84d9b37b96f9ad33e8af3bfa13b0ec9b458ff Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Tue, 16 Apr 2024 10:10:02 +0200 Subject: [PATCH 1/4] Add make build to test yml --- .github/workflows/test.yml | 3 +++ docker_scripts/dakota-start.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d8aa860..9ee937e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,5 +27,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + - name: Make build + run: make build - name: Make run-local run: make run-local + diff --git a/docker_scripts/dakota-start.py b/docker_scripts/dakota-start.py index f3f4a1e..5ed05ef 100755 --- a/docker_scripts/dakota-start.py +++ b/docker_scripts/dakota-start.py @@ -62,7 +62,8 @@ def __init__(self): is_initiator=True, ) - self.clean_output(self.output0_dir_path) + if self.output0_dir_path.exists(): + self.clean_output(self.output0_dir_path) def clean_output(self, dir_path): for item in dir_path.iterdir(): From 79b032b60c2c9bc199824b2417a3fb18c7046ea8 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Tue, 16 Apr 2024 10:12:05 +0200 Subject: [PATCH 2/4] Remove tty access docker compose --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e4153e5..8305161 100755 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ version-patch version-minor version-major: .bumpversion.cfg ## increases service .PHONY: compose-spec compose-spec: ## runs ooil to assemble the docker-compose.yml file - @docker run -it --rm -v $(PWD):/${DOCKER_IMAGE_NAME} \ + @docker run --rm -v $(PWD):/${DOCKER_IMAGE_NAME} \ -u $(shell id -u):$(shell id -g) \ itisfoundation/ci-service-integration-library:v1.0.1-dev-33 \ sh -c "cd /${DOCKER_IMAGE_NAME} && ooil compose" From 4a6dbd7693aaff7d10091a254f519e05ee2b6c07 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Tue, 16 Apr 2024 10:16:06 +0200 Subject: [PATCH 3/4] Add gitignore to output_0 to create it --- validation/outputs/output_0/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 validation/outputs/output_0/.gitignore diff --git a/validation/outputs/output_0/.gitignore b/validation/outputs/output_0/.gitignore new file mode 100644 index 0000000..e69de29 From e898ac833b29d0e6efadac964ea95e2b3862b3f2 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Tue, 16 Apr 2024 10:19:19 +0200 Subject: [PATCH 4/4] Add gitignore to input_0 --- validation/inputs/input_0/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 validation/inputs/input_0/.gitignore diff --git a/validation/inputs/input_0/.gitignore b/validation/inputs/input_0/.gitignore new file mode 100644 index 0000000..e69de29