From 52e80fd78eb605d7a3fce0e2467bf42c182cbafe Mon Sep 17 00:00:00 2001 From: namke Date: Mon, 16 Mar 2026 13:39:58 +0000 Subject: [PATCH 1/6] Added configure as a build dependency --- .vscode/tasks.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4f4c455..cb6f482 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -111,6 +111,9 @@ "options": { "cwd": "${workspaceRoot}/code/build" }, + "dependsOn": [ + "configure" + ], "presentation": { "clear": true, "showReuseMessage": false, @@ -127,6 +130,9 @@ "options": { "cwd": "${workspaceRoot}/code/build" }, + "dependsOn": [ + "configure" + ], "presentation": { "clear": true, "showReuseMessage": false, From 386d8e6b6de60191d080a8469b9283896afaf69c Mon Sep 17 00:00:00 2001 From: minimism Date: Mon, 16 Mar 2026 15:26:36 +0000 Subject: [PATCH 2/6] Update makefile.yml --- .github/workflows/makefile.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 784cd45..8880447 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -9,10 +9,22 @@ on: branches: - 'main' +env: + SW_VER: develop + jobs: build: runs-on: ubuntu-latest steps: + - name: Sets env vars for PR + run: | + echo "SW_VER=${{ github.ref_name }}" >> $GITHUB_ENV + if: startsWith(github.ref, 'refs/tags') + + - name: display version + run: | + echo "Building ${{env.SW_VER}}" + exit(1) - name: Checkout kastle2 uses: actions/checkout@v6 @@ -42,7 +54,9 @@ jobs: ./configure.sh - name: Build Project - run: make -C ${{github.workspace}}/kastle2/code/build + run: | + echo ${{github.ref_name}} + make -C ${{github.workspace}}/kastle2/code/build - name: Upload artifacts uses: actions/upload-artifact@v4 From b2ac513e9e1ea32d34eceab5bc6503c3193ae6fa Mon Sep 17 00:00:00 2001 From: minimism Date: Mon, 16 Mar 2026 15:28:10 +0000 Subject: [PATCH 3/6] Update makefile.yml --- .github/workflows/makefile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 8880447..42a6ca7 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -5,7 +5,7 @@ on: branches: - 'main' pull_request: - types: [opened, reopened] + types: [opened, reopened, synchronize] branches: - 'main' From 13f6cb7bf0f36b9e2bb90a8be41c73a4c3dd40ab Mon Sep 17 00:00:00 2001 From: minimism Date: Mon, 16 Mar 2026 15:35:49 +0000 Subject: [PATCH 4/6] Update makefile.yml --- .github/workflows/makefile.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 42a6ca7..0d2275a 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -24,7 +24,6 @@ jobs: - name: display version run: | echo "Building ${{env.SW_VER}}" - exit(1) - name: Checkout kastle2 uses: actions/checkout@v6 From b9066310474a6461f37220a6c857a05ede1c1272 Mon Sep 17 00:00:00 2001 From: minimism Date: Tue, 17 Mar 2026 14:17:10 +0000 Subject: [PATCH 5/6] Update firmware versioning in workflow file --- .github/workflows/makefile.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 0d2275a..9485a96 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -82,12 +82,12 @@ jobs: #mkdir -p kastle2-webapps/wave-bard-sample-loader/public/firmwares # Copy firmware with version (branch name) - cp kastle2/code/build/output/kastle2-wave-bard.uf2 "kastle2-webapps/wave-bard-sample-loader/public/firmwares/kastle2-wave-bard-${{ github.ref_name }}-no-samples.uf2" + cp kastle2/code/build/output/kastle2-wave-bard.uf2 "kastle2-webapps/wave-bard-sample-loader/public/firmwares/kastle2-wave-bard-${{ env.SW_VER }}-no-samples.uf2" # Change to webapps directory and commit cd kastle2-webapps - git add "wave-bard-sample-loader/public/firmwares/kastle2-wave-bard-${{ github.ref_name }}-no-samples.uf2" - git commit -m "Update wave-bard firmware from ${{ github.ref_name }} branch (commit ${{ github.sha }})" + git add "wave-bard-sample-loader/public/firmwares/kastle2-wave-bard-${{ env.SW_VER }}-no-samples.uf2" + git commit -m "Update wave-bard firmware from ${{ env.SW_VER }} branch (commit ${{ github.sha }})" git push - name: release From 011067190b6408556124bb10c35626b1237396ec Mon Sep 17 00:00:00 2001 From: minimism Date: Sat, 21 Mar 2026 22:42:43 +0000 Subject: [PATCH 6/6] Update makefile.yml Fixed artefact name --- .github/workflows/makefile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 9485a96..e606aa8 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -60,7 +60,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: build-${{github.ref_name}} + name: build-${{env.SW_VER}} path: kastle2/code/build/output/*.uf2 - name: Publish firmware to kastle2-webapps