diff options
| author | Joshua Shreve <j.a.shreve@gmail.com> | 2021-08-22 13:49:28 -0400 |
|---|---|---|
| committer | Joshua Shreve <j.a.shreve@gmail.com> | 2021-08-22 13:49:28 -0400 |
| commit | 33302b07c3ec3c5f887f43d269f0b2ca5145a4f9 (patch) | |
| tree | 594351478fe8edc99a049b1d1046a826a5d3edea | |
| parent | f94209c3a0c065eb3af5ff0a75f8ffc6dbd0223f (diff) | |
trying to fix all workflows to work.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | things/.gitkeep | 0 |
3 files changed, 8 insertions, 5 deletions
@@ -14,4 +14,6 @@ debug_* */__pycache__/* *~$* -things/
\ No newline at end of file +things/*.scad +things/*.step +things/*.stl
\ No newline at end of file @@ -5,6 +5,7 @@ current_dir := $(dir $(mkfile_path)) source_dir := ${current_dir}"src" artifact_dir := ${current_dir}"things" +config_dir := ${current_dir}"configs" DOCKER_CMD := "docker" .DEFAULT_GOAL := help @@ -34,27 +35,27 @@ build-container: check-requirements ## Build docker container. config: check-requirements ## Generate configuration. @echo "\nGenerate configuration..\n" && \ - ${DOCKER_CMD} run --rm --name DM-config -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i generate_configuration.py && \ + ${DOCKER_CMD} run --rm --name DM-config -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard python3 -i generate_configuration.py && \ echo "Done" .PHONY: config build-models: check-requirements ## Build models. @echo "\nGenerate configured model..\n" && \ cd ${current_dir} && \ - ${DOCKER_CMD} run --rm --name DM-run -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i dactyl_manuform.py && \ + ${DOCKER_CMD} run --rm --name DM-run -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard python3 -i dactyl_manuform.py && \ echo "Done" .PHONY: config build-models: check-requirements ## Build models. @echo "\nGenerate release models..\n" && \ cd ${current_dir} && \ - ${DOCKER_CMD} run --rm --name DM-release-build -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i model_builder.py && \ + ${DOCKER_CMD} run --rm --name DM-release-build -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard python3 -i model_builder.py && \ echo "Done" .PHONY: config shell: check-requirements ## Open an interactive shell inside a container. - @${DOCKER_CMD} run --rm -it --name DM-shell -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard bash && \ + @${DOCKER_CMD} run --rm -it --name DM-shell -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things -v ${config_dir}:/app/configs dactyl-keyboard bash && \ echo "\nBye!" .PHONY: shell diff --git a/things/.gitkeep b/things/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/things/.gitkeep |