From 7347c131bb56558377cdd2a61c06d4958649c641 Mon Sep 17 00:00:00 2001 From: Logicer Date: Fri, 20 Dec 2024 18:17:35 +1100 Subject: [PATCH] try to fix build --- .github/workflows/build.yml | 7 ++++--- Makefile | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fea5e5e..6398f90 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: - cron: '0 0 1 */2 *' env: - outPath: "/usr/local/lib/pam/pam-watchid.so.2" + outPath: "/usr/local/lib/pam/pam-watchid.so" jobs: build: @@ -41,6 +41,7 @@ jobs: - name: Get Version id: getVersion + if: ${{ matrix.xcode-select == 'xcode' && matrix.version == 15 }} run: echo "version=$(cat version)" >> "$GITHUB_OUTPUT" - name: Upload artifacts @@ -48,7 +49,7 @@ jobs: if: ${{ matrix.xcode-select == 'xcode' && matrix.version == 15 }} with: name: pam-watchid.so.${{ steps.getVersion.outputs.version }} - path: ${{ env.outPath }} + path: ${{ env.outPath }}.${{ steps.getVersion.outputs.version }} if-no-files-found: error retention-days: ${{ github.event_name == 'pull_request' && 7 || 90 }} @@ -56,4 +57,4 @@ jobs: uses: actions/attest-build-provenance@v2 if: ${{ matrix.xcode-select == 'xcode' && matrix.version == 15 }} with: - subject-path: ${{ env.outPath }} + subject-path: ${{ env.outPath }}.${{ steps.getVersion.outputs.version }} diff --git a/Makefile b/Makefile index 8772c67..eb9d6b1 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ ifeq "$(SDK_REQUIRED_MAJOR_VER)" "$(word 1, $(sort $(SDK_REQUIRED_MAJOR_VER) $(X endif all: + echo $(VERSION) swiftc watchid-pam-extension.swift $(DEFINES) -o $(LIBRARY_PREFIX)_x86_64.so -target x86_64-$(TARGET) -emit-library swiftc watchid-pam-extension.swift $(DEFINES) -o $(LIBRARY_PREFIX)_arm64.so -target arm64-$(TARGET) -emit-library lipo -create $(LIBRARY_PREFIX)_arm64.so $(LIBRARY_PREFIX)_x86_64.so -output $(LIBRARY_NAME)