diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23c3edf2ac..353692db77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: name: Build steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get version data id: get_info run: | @@ -21,7 +21,7 @@ jobs: echo "file_prefix=$file_prefix" >> $GITHUB_OUTPUT bin/get_version.sh $branch_name $commit - name: Cache west modules - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-zephyr-modules with: @@ -53,7 +53,7 @@ jobs: - name: Rename zmk.uf2 run: cp build/left/zephyr/zmk.uf2 ${{ steps.get_info.outputs.file_prefix }}-left.uf2 && cp build/right/zephyr/zmk.uf2 ${{ steps.get_info.outputs.file_prefix }}-right.uf2 - name: Archive (Adv360) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: firmware path: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f73ee2a57..1f9d722347 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Here's all notable changes and commits to both the configuration repo and the ba Many thanks to all those who have submitted issues and pull requests to make this firmware better! ## Config repo +14/3/2024 - Fix Makefile errors that prevent builds on macOS [#409](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/409) + +18/2/2024 - Fix version.dtsi reset after build when running local builds [#385](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/385) + +12/2/2024 - Update GitHub build workflow to use the latest actions [#376](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/376) + 2/2/2024 - Makefile enhancements (build left side firmware only, separate clean targets for firmware and docker, reset of version.dtsi after build) [#363](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/363) 1/16/2024 - Change the makefile to fis WSL2 compatibility [#335](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/335) diff --git a/Makefile b/Makefile index 9d7d347a5c..0598579485 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,7 @@ -DOCKER := "$(shell { command -v podman || command -v docker; })" -TIMESTAMP := "$(shell date -u +"%Y%m%d%H%M")" -COMMIT := "$(shell git rev-parse --short HEAD 2>/dev/null)" -detected_OS := "$(shell uname)" # Classify UNIX OS -ifeq ($(strip $(detected_OS)),Darwin) #We only care if it's OS X +DOCKER := $(shell { command -v podman || command -v docker; }) +TIMESTAMP := $(shell date -u +"%Y%m%d%H%M") +COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null) +ifeq ($(shell uname),Darwin) SELINUX1 := SELINUX2 := else @@ -22,7 +21,7 @@ all: -e COMMIT=$(COMMIT) \ -e BUILD_RIGHT=true \ zmk - $(shell git checkout config/version.dtsi) + git checkout config/version.dtsi left: $(shell bin/get_version.sh >> /dev/null) @@ -34,7 +33,7 @@ left: -e COMMIT=$(COMMIT) \ -e BUILD_RIGHT=false \ zmk - $(shell git checkout config/version.dtsi) + git checkout config/version.dtsi clean_firmware: rm -f firmware/*.uf2