summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/release.yaml8
-rw-r--r--.gitignore1
-rw-r--r--Makefile1
3 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 698bb6e..e1befef 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -9,7 +9,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
- timeout-minutes: 60
+ timeout-minutes: 180
name: "Build artifacts and publish Release"
steps:
- name: Checkout
@@ -17,14 +17,14 @@ jobs:
- uses: satackey/action-docker-layer-caching@v0.0.11
continue-on-error: true
- name: Clean up
- run: rm -r things/*
+ run: rm -r things/**
- name: Build
run: make build
- name: Release
uses: softprops/action-gh-release@v1
with:
draft: false
- files: things/*
+ files: things/**
tag_name: v${{ github.run_number }}
env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 46f8691..6eb3c45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
*.scad
/target
.idea/
+.DS_Store
*.FCStd1
debug_*
*/__pycache__/*
diff --git a/Makefile b/Makefile
index 688ea35..d755a54 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,6 @@ build-models: check-requirements ## Build models.
${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 && \
echo "Done"
.PHONY: config
-docker run --name DM-release-build -d -v "%cd%/src:/app/src" -v "%cd%/things:/app/things" dactyl-keyboard python3 -i model_builder.py
shell: check-requirements ## Open an interactive shell inside a container.