Skip to content

Commit 33302b0

Browse files
committed
trying to fix all workflows to work.
1 parent f94209c commit 33302b0

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@
1414
debug_*
1515
*/__pycache__/*
1616
*~$*
17-
things/
17+
things/*.scad
18+
things/*.step
19+
things/*.stl

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ current_dir := $(dir $(mkfile_path))
55

66
source_dir := ${current_dir}"src"
77
artifact_dir := ${current_dir}"things"
8+
config_dir := ${current_dir}"configs"
89

910
DOCKER_CMD := "docker"
1011
.DEFAULT_GOAL := help
@@ -34,27 +35,27 @@ build-container: check-requirements ## Build docker container.
3435

3536
config: check-requirements ## Generate configuration.
3637
@echo "\nGenerate configuration..\n" && \
37-
${DOCKER_CMD} run --rm --name DM-config -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i generate_configuration.py && \
38+
${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 && \
3839
echo "Done"
3940
.PHONY: config
4041

4142
build-models: check-requirements ## Build models.
4243
@echo "\nGenerate configured model..\n" && \
4344
cd ${current_dir} && \
44-
${DOCKER_CMD} run --rm --name DM-run -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard python3 -i dactyl_manuform.py && \
45+
${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 && \
4546
echo "Done"
4647
.PHONY: config
4748

4849
build-models: check-requirements ## Build models.
4950
@echo "\nGenerate release models..\n" && \
5051
cd ${current_dir} && \
51-
${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 && \
52+
${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 && \
5253
echo "Done"
5354
.PHONY: config
5455

5556

5657
shell: check-requirements ## Open an interactive shell inside a container.
57-
@${DOCKER_CMD} run --rm -it --name DM-shell -v ${source_dir}:/app/src -v ${artifact_dir}:/app/things dactyl-keyboard bash && \
58+
@${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 && \
5859
echo "\nBye!"
5960
.PHONY: shell
6061

things/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)