diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c8ab35..928a098 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,16 @@ jobs: # seen in: https://github.com/ActivityWatch/aw-watcher-window/actions/runs/5891369412/job/15978283144 pip install poetry==1.3.2 source venv/bin/activate || source venv/Scripts/activate - make build + if [ "${{ runner.os }}" = "macOS" ]; then + MACOSX_DEPLOYMENT_TARGET=14.0 make build + else + make build + fi + - name: Check macOS deployment target + if: runner.os == 'macOS' + shell: bash + run: | + otool -l aw_watcher_window/aw-watcher-window-macos | grep -A4 'LC_BUILD_VERSION' | grep 'minos 14.0' - name: Run tests shell: bash run: | @@ -45,7 +54,11 @@ jobs: shell: bash run: | source venv/bin/activate || source venv/Scripts/activate - make package + if [ "${{ runner.os }}" = "macOS" ]; then + MACOSX_DEPLOYMENT_TARGET=14.0 make package + else + make package + fi - name: Test package shell: bash run: | diff --git a/Makefile b/Makefile index 4c50b28..7e162dc 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ .PHONY: build test package clean +MACOSX_DEPLOYMENT_TARGET ?= 14.0 + build: poetry install # if macOS, build swift @@ -10,7 +12,7 @@ build: build-swift: aw_watcher_window/aw-watcher-window-macos aw_watcher_window/aw-watcher-window-macos: aw_watcher_window/macos.swift - swiftc $^ -o $@ + swiftc -target "$(shell uname -m)-apple-macosx$(MACOSX_DEPLOYMENT_TARGET)" $^ -o $@ test: aw-watcher-window --help