From b597e0924d1889d0795d70c7778f2d725ec9a404 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 18:41:31 -0700 Subject: [PATCH 01/42] Update macos_build_m1.yml Self-sign dmg --- .github/workflows/macos_build_m1.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 380c7cf..b8a3699 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -43,6 +43,14 @@ jobs: - name: Build run: npm run make + + - name: Self-sign - Avoid Gatekeeper DMG corrupted warning + run: | + unzip /Users/runner/work/Playful/Playful/out/make/Playful*.zip + rm -rf /Users/runner/work/Playful/Playful/out/make/Playful*.zip + codesign --force --deep -s Playful.app + zip /Users/runner/work/Playful/Playful/out/make/Playful-apple-silicon.zip /Users/runner/work/Playful/Playful/out/make/Playful.app + rm -rf Playful.app - name: Upload Build File uses: actions/upload-artifact@v4 From f8ac386eae45182732750742dcc5edcab8d95587 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 19:08:19 -0700 Subject: [PATCH 02/42] Update macos_build_m1.yml Update paths --- .github/workflows/macos_build_m1.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index b8a3699..7fd741a 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -2,7 +2,8 @@ # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs name: MacOS NodeJS-CMake - +env: + DMG_OUTPUT: ${{github.workspace}}/${{ runner.arch == 'ARM64' && Playful/out/make/zip/darwin/arm64/ || Playful/out/make/zip/darwin/x64/}} on: push: branches: [ "master" ] @@ -46,11 +47,11 @@ jobs: - name: Self-sign - Avoid Gatekeeper DMG corrupted warning run: | - unzip /Users/runner/work/Playful/Playful/out/make/Playful*.zip - rm -rf /Users/runner/work/Playful/Playful/out/make/Playful*.zip - codesign --force --deep -s Playful.app - zip /Users/runner/work/Playful/Playful/out/make/Playful-apple-silicon.zip /Users/runner/work/Playful/Playful/out/make/Playful.app - rm -rf Playful.app + unzip ${{ env.DMG_OUTPUT }}/Playful*.zip + rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip + codesign --force --deep -s ${{ env.DMG_OUTPUT }}/Playful.app + zip ${{ env.DMG_OUTPUT }}/Playful-apple-silicon.zip ${{ env.DMG_OUTPUT }}/Playful.app + rm -rf ${{ env.DMG_OUTPUT }}/Playful.app - name: Upload Build File uses: actions/upload-artifact@v4 From 0e149a3e2545f61d622dd877b54d661368f708ef Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 19:09:48 -0700 Subject: [PATCH 03/42] Update macos_build_m1.yml Fix typo --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 7fd741a..8d08543 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -3,7 +3,7 @@ name: MacOS NodeJS-CMake env: - DMG_OUTPUT: ${{github.workspace}}/${{ runner.arch == 'ARM64' && Playful/out/make/zip/darwin/arm64/ || Playful/out/make/zip/darwin/x64/}} + DMG_OUTPUT: ${{github.workspace}}/${{ runner.arch == 'ARM64' && 'Playful/out/make/zip/darwin/arm64/' || 'Playful/out/make/zip/darwin/x64/'}} on: push: branches: [ "master" ] From d276803cd998ce92514fb6f39770669e30227d35 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 19:14:48 -0700 Subject: [PATCH 04/42] Update macos_build_m1.yml Env fix --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 8d08543..9d6ae68 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -3,7 +3,7 @@ name: MacOS NodeJS-CMake env: - DMG_OUTPUT: ${{github.workspace}}/${{ runner.arch == 'ARM64' && 'Playful/out/make/zip/darwin/arm64/' || 'Playful/out/make/zip/darwin/x64/'}} + DMG_OUTPUT: ${{github.workspace}}/${{ 'Playful/out/make/zip/darwin/*64/ '}} on: push: branches: [ "master" ] From 8d6027a31beed2a4c568f81effcf749ff09255f4 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:08:41 -0700 Subject: [PATCH 05/42] Update macos_build_m1.yml Typo --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 9d6ae68..8b0b3d4 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -3,7 +3,7 @@ name: MacOS NodeJS-CMake env: - DMG_OUTPUT: ${{github.workspace}}/${{ 'Playful/out/make/zip/darwin/*64/ '}} + DMG_OUTPUT: ${{github.workspace}}/${{ 'Playful/out/make/zip/darwin/*64/'}} on: push: branches: [ "master" ] From 1f1fb7cf666324b814b333db8c84b04597953fe5 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:16:55 -0700 Subject: [PATCH 06/42] debug --- .github/workflows/macos_build_m1.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 8b0b3d4..cdbc485 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -47,6 +47,9 @@ jobs: - name: Self-sign - Avoid Gatekeeper DMG corrupted warning run: | + pwd + ls + cd ${{ env.DMG_OUTPUT }} && ls unzip ${{ env.DMG_OUTPUT }}/Playful*.zip rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip codesign --force --deep -s ${{ env.DMG_OUTPUT }}/Playful.app From 51d04d51967f2ef9f62e197633e3e7876e32470e Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:21:01 -0700 Subject: [PATCH 07/42] debug --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index cdbc485..da7b032 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -49,7 +49,7 @@ jobs: run: | pwd ls - cd ${{ env.DMG_OUTPUT }} && ls + cd /Users/runner/work/Playful/Playful/Playful/out/make/zip/darwin/ && ls unzip ${{ env.DMG_OUTPUT }}/Playful*.zip rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip codesign --force --deep -s ${{ env.DMG_OUTPUT }}/Playful.app From e9697e121b88a3d7bb52dc93a40c302411d0c554 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:28:16 -0700 Subject: [PATCH 08/42] debug --- .github/workflows/macos_build_m1.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index da7b032..53b852a 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -49,6 +49,8 @@ jobs: run: | pwd ls + cd /Users/runner/work/Playful/Playful/Playful/out/make/ && ls + cd /Users/runner/work/Playful/Playful/Playful/out/make/zip && ls cd /Users/runner/work/Playful/Playful/Playful/out/make/zip/darwin/ && ls unzip ${{ env.DMG_OUTPUT }}/Playful*.zip rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip From c107cce1b46b8c5c8b8ff5f77435c238f69ec3e3 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:33:28 -0700 Subject: [PATCH 09/42] debug --- .github/workflows/macos_build_m1.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 53b852a..c7b5381 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -3,7 +3,7 @@ name: MacOS NodeJS-CMake env: - DMG_OUTPUT: ${{github.workspace}}/${{ 'Playful/out/make/zip/darwin/*64/'}} + DMG_OUTPUT: ${{github.workspace}}/${{ '/out/make/zip/darwin/*64/'}} on: push: branches: [ "master" ] @@ -49,9 +49,9 @@ jobs: run: | pwd ls - cd /Users/runner/work/Playful/Playful/Playful/out/make/ && ls - cd /Users/runner/work/Playful/Playful/Playful/out/make/zip && ls - cd /Users/runner/work/Playful/Playful/Playful/out/make/zip/darwin/ && ls + cd /Users/runner/work/Playful/Playful/out/make/ && ls + cd /Users/runner/work/Playful/Playful/out/make/zip && ls + cd /Users/runner/work/Playful/Playful/out/make/zip/darwin/ && ls unzip ${{ env.DMG_OUTPUT }}/Playful*.zip rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip codesign --force --deep -s ${{ env.DMG_OUTPUT }}/Playful.app From 347663a22403005281fed5416523a7fca63c63a1 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:38:21 -0700 Subject: [PATCH 10/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index c7b5381..19f3500 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -48,13 +48,9 @@ jobs: - name: Self-sign - Avoid Gatekeeper DMG corrupted warning run: | pwd - ls - cd /Users/runner/work/Playful/Playful/out/make/ && ls - cd /Users/runner/work/Playful/Playful/out/make/zip && ls - cd /Users/runner/work/Playful/Playful/out/make/zip/darwin/ && ls unzip ${{ env.DMG_OUTPUT }}/Playful*.zip rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip - codesign --force --deep -s ${{ env.DMG_OUTPUT }}/Playful.app + codesign --force --deep -s - ${{ env.DMG_OUTPUT }}/Playful.app zip ${{ env.DMG_OUTPUT }}/Playful-apple-silicon.zip ${{ env.DMG_OUTPUT }}/Playful.app rm -rf ${{ env.DMG_OUTPUT }}/Playful.app From e114e1162fa0764cba1c896ad3ceaeff9267e13a Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:46:02 -0700 Subject: [PATCH 11/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 19f3500..90f749e 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -48,7 +48,7 @@ jobs: - name: Self-sign - Avoid Gatekeeper DMG corrupted warning run: | pwd - unzip ${{ env.DMG_OUTPUT }}/Playful*.zip + unzip ${{ env.DMG_OUTPUT }}/Playful*.zip -d ${{ env.DMG_OUTPUT }} rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip codesign --force --deep -s - ${{ env.DMG_OUTPUT }}/Playful.app zip ${{ env.DMG_OUTPUT }}/Playful-apple-silicon.zip ${{ env.DMG_OUTPUT }}/Playful.app From f895a4b2015a829188a36eb5970ba07246aced36 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:59:32 -0700 Subject: [PATCH 12/42] debug --- .github/workflows/macos_build_m1.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 90f749e..b0a26d1 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -47,11 +47,14 @@ jobs: - name: Self-sign - Avoid Gatekeeper DMG corrupted warning run: | - pwd - unzip ${{ env.DMG_OUTPUT }}/Playful*.zip -d ${{ env.DMG_OUTPUT }} + echo "Unzipping" + unzip -q ${{ env.DMG_OUTPUT }}/Playful*.zip -d ${{ env.DMG_OUTPUT }} + echo "Removing zip" rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip + echo "Codesigning" codesign --force --deep -s - ${{ env.DMG_OUTPUT }}/Playful.app - zip ${{ env.DMG_OUTPUT }}/Playful-apple-silicon.zip ${{ env.DMG_OUTPUT }}/Playful.app + + zip -r ${{ env.DMG_OUTPUT }}/Playful_apple_silicon.zip ${{ env.DMG_OUTPUT }}/Playful.app rm -rf ${{ env.DMG_OUTPUT }}/Playful.app - name: Upload Build File From ca503f0821c1200d5853c58ed39a23ecb9616870 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 23:04:39 -0700 Subject: [PATCH 13/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index b0a26d1..bed8773 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -53,6 +53,10 @@ jobs: rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip echo "Codesigning" codesign --force --deep -s - ${{ env.DMG_OUTPUT }}/Playful.app + echo "Zipping" + ls + echo "Targeted" + cd /Users/runner/work/Playful/Playful//out/make/zip/darwin/arm64 && ls zip -r ${{ env.DMG_OUTPUT }}/Playful_apple_silicon.zip ${{ env.DMG_OUTPUT }}/Playful.app rm -rf ${{ env.DMG_OUTPUT }}/Playful.app From ad933a499b5a9084cd01ba89fa8a917b0a65dbff Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 23:11:31 -0700 Subject: [PATCH 14/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index bed8773..3d1aed1 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -3,7 +3,7 @@ name: MacOS NodeJS-CMake env: - DMG_OUTPUT: ${{github.workspace}}/${{ '/out/make/zip/darwin/*64/'}} + DMG_OUTPUT: ${{github.workspace}}${{ '/out/make/zip/darwin/arm64'}} on: push: branches: [ "master" ] @@ -56,9 +56,9 @@ jobs: echo "Zipping" ls echo "Targeted" - cd /Users/runner/work/Playful/Playful//out/make/zip/darwin/arm64 && ls + cd ${{ env.DMG_OUTPUT }} && ls - zip -r ${{ env.DMG_OUTPUT }}/Playful_apple_silicon.zip ${{ env.DMG_OUTPUT }}/Playful.app + cd ${{ env.DMG_OUTPUT }} && zip -r Playful_apple_silicon.zip Playful.app rm -rf ${{ env.DMG_OUTPUT }}/Playful.app - name: Upload Build File From 6b5b578fe292b9e6e170ac7b6b907da62e7672a6 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 23:21:18 -0700 Subject: [PATCH 15/42] Works --- .github/workflows/macos_build_m1.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 3d1aed1..f5e2fe4 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -54,11 +54,8 @@ jobs: echo "Codesigning" codesign --force --deep -s - ${{ env.DMG_OUTPUT }}/Playful.app echo "Zipping" - ls - echo "Targeted" - cd ${{ env.DMG_OUTPUT }} && ls - cd ${{ env.DMG_OUTPUT }} && zip -r Playful_apple_silicon.zip Playful.app + echo "Removing .app" rm -rf ${{ env.DMG_OUTPUT }}/Playful.app - name: Upload Build File From 28d149c51de58eefa2f2d617e37b5300ae43c8a2 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 23:25:58 -0700 Subject: [PATCH 16/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index f5e2fe4..dffce5c 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -62,4 +62,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: Playful-darwin-amd64 - path: /Users/runner/work/Playful/Playful/out/make + path: ${{ env.DMG_OUTPUT }}/Playful_apple_silicon.zip From fa688d14ea48a11d0808f9adb9e02ecf57a16919 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 23:30:31 -0700 Subject: [PATCH 17/42] Quiet zip --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index dffce5c..14546d3 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -54,7 +54,7 @@ jobs: echo "Codesigning" codesign --force --deep -s - ${{ env.DMG_OUTPUT }}/Playful.app echo "Zipping" - cd ${{ env.DMG_OUTPUT }} && zip -r Playful_apple_silicon.zip Playful.app + cd ${{ env.DMG_OUTPUT }} && zip -q -r Playful_apple_silicon.zip Playful.app echo "Removing .app" rm -rf ${{ env.DMG_OUTPUT }}/Playful.app From df7effb6e8258f97246e84fb4b03254cf43ecf03 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Thu, 10 Jul 2025 23:58:27 -0700 Subject: [PATCH 18/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 14546d3..79b62a1 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -28,7 +28,7 @@ jobs: cmake-version: '3.16.x' - name: Use cmake - run: cmake --version + run: arch - name: Checkout Action uses: actions/checkout@v4 From 9c3a2f7dbda04352d373d1d290cc0a5ef7e425a8 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 00:02:54 -0700 Subject: [PATCH 19/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 79b62a1..df1e285 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -26,9 +26,15 @@ jobs: uses: jwlawson/actions-setup-cmake@v2 with: cmake-version: '3.16.x' - + + - name: Show Swift version and architecture + run: | + swiftc --version + file $(which swiftc) + arch + - name: Use cmake - run: arch + run: cmake --version - name: Checkout Action uses: actions/checkout@v4 From 73119a463077a775b85fdb92e017c45a05844c1f Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 00:06:18 -0700 Subject: [PATCH 20/42] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94cb0d4..9d08eee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set(SWIFT_SOURCES ${CMAKE_SOURCE_DIR}/mediaSubscriber.swift) set(SWIFT_OUTPUT ${CMAKE_SOURCE_DIR}/libMediaSubscriber.dylib) add_custom_command( OUTPUT ${SWIFT_OUTPUT} - COMMAND swiftc -emit-library ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} + COMMAND swiftc -emit-library -taget arm64-apple-macosx ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} DEPENDS ${SWIFT_SOURCES} COMMENT "Compiling Swift code" ) From 877ae5ddaaecd0fa6ea45e0e2d0a8c42ba5e19e4 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 00:10:00 -0700 Subject: [PATCH 21/42] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d08eee..ef6f010 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set(SWIFT_SOURCES ${CMAKE_SOURCE_DIR}/mediaSubscriber.swift) set(SWIFT_OUTPUT ${CMAKE_SOURCE_DIR}/libMediaSubscriber.dylib) add_custom_command( OUTPUT ${SWIFT_OUTPUT} - COMMAND swiftc -emit-library -taget arm64-apple-macosx ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} + COMMAND swiftc -emit-library -target arm64-apple-macosx ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} DEPENDS ${SWIFT_SOURCES} COMMENT "Compiling Swift code" ) From 197cacd7243e648e8e50ea8a3444648ce80f7b00 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 00:15:01 -0700 Subject: [PATCH 22/42] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef6f010..6abd854 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set(SWIFT_SOURCES ${CMAKE_SOURCE_DIR}/mediaSubscriber.swift) set(SWIFT_OUTPUT ${CMAKE_SOURCE_DIR}/libMediaSubscriber.dylib) add_custom_command( OUTPUT ${SWIFT_OUTPUT} - COMMAND swiftc -emit-library -target arm64-apple-macosx ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} + COMMAND swiftc -emit-library -target arm64-apple-macosx14.0 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} DEPENDS ${SWIFT_SOURCES} COMMENT "Compiling Swift code" ) From 6fc8c1691ce487176715f09276cd6499d5f0fc9d Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 00:27:50 -0700 Subject: [PATCH 23/42] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6abd854..16307c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set(SWIFT_SOURCES ${CMAKE_SOURCE_DIR}/mediaSubscriber.swift) set(SWIFT_OUTPUT ${CMAKE_SOURCE_DIR}/libMediaSubscriber.dylib) add_custom_command( OUTPUT ${SWIFT_OUTPUT} - COMMAND swiftc -emit-library -target arm64-apple-macosx14.0 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} + COMMAND swiftc -emit-library -target arm64-apple-macosx10.9 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} DEPENDS ${SWIFT_SOURCES} COMMENT "Compiling Swift code" ) From 1e43403bfada822c6059c13824811958de1b47c2 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 00:32:14 -0700 Subject: [PATCH 24/42] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16307c7..1647e0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set(SWIFT_SOURCES ${CMAKE_SOURCE_DIR}/mediaSubscriber.swift) set(SWIFT_OUTPUT ${CMAKE_SOURCE_DIR}/libMediaSubscriber.dylib) add_custom_command( OUTPUT ${SWIFT_OUTPUT} - COMMAND swiftc -emit-library -target arm64-apple-macosx10.9 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} + COMMAND swiftc -emit-library -target arm64-apple-macosx11.0 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} DEPENDS ${SWIFT_SOURCES} COMMENT "Compiling Swift code" ) From dec6bbe018ec8e07cb321d345720e5cb06ea4d30 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 00:57:56 -0700 Subject: [PATCH 25/42] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1647e0b..bfaa19d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set(SWIFT_SOURCES ${CMAKE_SOURCE_DIR}/mediaSubscriber.swift) set(SWIFT_OUTPUT ${CMAKE_SOURCE_DIR}/libMediaSubscriber.dylib) add_custom_command( OUTPUT ${SWIFT_OUTPUT} - COMMAND swiftc -emit-library -target arm64-apple-macosx11.0 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} + COMMAND swiftc -emit-library -target arm64-apple-macosx11.0 -target x86_64-apple-macos11.0 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} DEPENDS ${SWIFT_SOURCES} COMMENT "Compiling Swift code" ) From 70e144dcb0ae76a6f829533744602aaaf547f32f Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 00:58:12 -0700 Subject: [PATCH 26/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 63 +++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index df1e285..ed60721 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -4,6 +4,7 @@ name: MacOS NodeJS-CMake env: DMG_OUTPUT: ${{github.workspace}}${{ '/out/make/zip/darwin/arm64'}} + DMG_OUTPUT_INTEL: ${{github.workspace}}${{ '/out/make/zip/darwin/x86'}} on: push: branches: [ "master" ] @@ -12,7 +13,7 @@ on: workflow_dispatch: jobs: - build: + M1Build: runs-on: macos-latest @@ -59,13 +60,63 @@ jobs: rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip echo "Codesigning" codesign --force --deep -s - ${{ env.DMG_OUTPUT }}/Playful.app - echo "Zipping" - cd ${{ env.DMG_OUTPUT }} && zip -q -r Playful_apple_silicon.zip Playful.app - echo "Removing .app" - rm -rf ${{ env.DMG_OUTPUT }}/Playful.app - name: Upload Build File uses: actions/upload-artifact@v4 with: name: Playful-darwin-amd64 - path: ${{ env.DMG_OUTPUT }}/Playful_apple_silicon.zip + path: ${{ env.DMG_OUTPUT }}/Playful.app + + IntelBuild: + + runs-on: macos-13 + + strategy: + matrix: + node-version: [18.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + + steps: + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v2 + with: + cmake-version: '3.16.x' + + - name: Show Swift version and architecture + run: | + swiftc --version + file $(which swiftc) + arch + + - name: Use cmake + run: cmake --version + + - name: Checkout Action + uses: actions/checkout@v4 + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + cache: 'npm' + + - name: Install nodejs dependencies + run: npm i + + - name: Build + run: npm run make + + - name: Self-sign - Avoid Gatekeeper DMG corrupted warning + run: | + echo "Unzipping" + unzip -q ${{ env.DMG_OUTPUT_INTEL }}/Playful*.zip -d ${{ env.DMG_OUTPUT_INTEL }} + echo "Removing zip" + rm -rf ${{ env.DMG_OUTPUT_INTEL }}/Playful*.zip + echo "Codesigning" + codesign --force --deep -s - ${{ env.DMG_OUTPUT_INTEL }}/Playful.app + + - name: Upload Build File + uses: actions/upload-artifact@v4 + with: + name: Playful-darwin-intel + path: ${{ env.DMG_OUTPUT_INTEL }}/Playful.app From b3e7077b20145ad5027f7ee2dde8298129284664 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:07:50 -0700 Subject: [PATCH 27/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index ed60721..163d315 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -60,6 +60,10 @@ jobs: rm -rf ${{ env.DMG_OUTPUT }}/Playful*.zip echo "Codesigning" codesign --force --deep -s - ${{ env.DMG_OUTPUT }}/Playful.app + echo "Zipping" + cd ${{ env.DMG_OUTPUT }} && zip -q -r Playful_apple_silicon.zip Playful.app + echo "Removing .app" + rm -rf ${{ env.DMG_OUTPUT }}/Playful.app - name: Upload Build File uses: actions/upload-artifact@v4 @@ -114,6 +118,10 @@ jobs: rm -rf ${{ env.DMG_OUTPUT_INTEL }}/Playful*.zip echo "Codesigning" codesign --force --deep -s - ${{ env.DMG_OUTPUT_INTEL }}/Playful.app + echo "Zipping" + cd ${{ env.DMG_OUTPUT_INTEL }} && zip -q -r Playful_apple_silicon.zip Playful.app + echo "Removing .app" + rm -rf ${{ env.DMG_OUTPUT_INTEL }}/Playful.app - name: Upload Build File uses: actions/upload-artifact@v4 From 56ecf7774d7abb38f5a40b47e70ff6980dcf0bf8 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:19:12 -0700 Subject: [PATCH 28/42] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bfaa19d..9194e96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set(SWIFT_SOURCES ${CMAKE_SOURCE_DIR}/mediaSubscriber.swift) set(SWIFT_OUTPUT ${CMAKE_SOURCE_DIR}/libMediaSubscriber.dylib) add_custom_command( OUTPUT ${SWIFT_OUTPUT} - COMMAND swiftc -emit-library -target arm64-apple-macosx11.0 -target x86_64-apple-macos11.0 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} + COMMAND swiftc -emit-library -target $(uname -m)-apple-macosx11.0 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} DEPENDS ${SWIFT_SOURCES} COMMENT "Compiling Swift code" ) From d9126242b4bb741fe2aa095435a0142122d69284 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:21:18 -0700 Subject: [PATCH 29/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 163d315..1ccd7f0 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -4,7 +4,7 @@ name: MacOS NodeJS-CMake env: DMG_OUTPUT: ${{github.workspace}}${{ '/out/make/zip/darwin/arm64'}} - DMG_OUTPUT_INTEL: ${{github.workspace}}${{ '/out/make/zip/darwin/x86'}} + DMG_OUTPUT_INTEL: ${{github.workspace}}${{ '/out/make/zip/darwin/x86_64'}} on: push: branches: [ "master" ] From 34ef5e413b6ed33ecab9b92f5da135b79b540685 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:28:19 -0700 Subject: [PATCH 30/42] Update CMakeLists.txt --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9194e96..d440b43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") target_compile_options(${PROJECT_NAME} PRIVATE -fvisibility=hidden) set_target_properties(${PROJECT_NAME} PROPERTIES XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN "YES") endif() +execute_process( + COMMAND uname -m + OUTPUT_VARIABLE HOST_ARCH + OUTPUT_STRIP_TRAILING_WHITESPACE +) # Link Node.js addon API execute_process(COMMAND node -p "require('node-addon-api').targets" OUTPUT_VARIABLE NODE_ADDON_API_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -50,7 +55,7 @@ set(SWIFT_SOURCES ${CMAKE_SOURCE_DIR}/mediaSubscriber.swift) set(SWIFT_OUTPUT ${CMAKE_SOURCE_DIR}/libMediaSubscriber.dylib) add_custom_command( OUTPUT ${SWIFT_OUTPUT} - COMMAND swiftc -emit-library -target $(uname -m)-apple-macosx11.0 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} + COMMAND swiftc -emit-library -target ${HOST_ARCH}-apple-macosx11.0 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} DEPENDS ${SWIFT_SOURCES} COMMENT "Compiling Swift code" ) From 444a9320430e26ca3cdd69465dd7003e423c851a Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:31:21 -0700 Subject: [PATCH 31/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 1ccd7f0..53d0d0e 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -30,6 +30,7 @@ jobs: - name: Show Swift version and architecture run: | + uname -m swiftc --version file $(which swiftc) arch From 87d9ece1de70d58a2acafd8b4902b4c5e6617b39 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:32:31 -0700 Subject: [PATCH 32/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 53d0d0e..574f27d 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -114,6 +114,7 @@ jobs: - name: Self-sign - Avoid Gatekeeper DMG corrupted warning run: | echo "Unzipping" + cd ./out/make/zip/darwin/ && ls unzip -q ${{ env.DMG_OUTPUT_INTEL }}/Playful*.zip -d ${{ env.DMG_OUTPUT_INTEL }} echo "Removing zip" rm -rf ${{ env.DMG_OUTPUT_INTEL }}/Playful*.zip From 580f0b265a471bfc203eaadfbd5eff9f545bfbc9 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:36:33 -0700 Subject: [PATCH 33/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 574f27d..356d8f3 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -64,7 +64,7 @@ jobs: echo "Zipping" cd ${{ env.DMG_OUTPUT }} && zip -q -r Playful_apple_silicon.zip Playful.app echo "Removing .app" - rm -rf ${{ env.DMG_OUTPUT }}/Playful.app + rm -rf ${{ env.DMG_OUTPUT }}/Playful_apple_silicon.zip - name: Upload Build File uses: actions/upload-artifact@v4 @@ -121,9 +121,9 @@ jobs: echo "Codesigning" codesign --force --deep -s - ${{ env.DMG_OUTPUT_INTEL }}/Playful.app echo "Zipping" - cd ${{ env.DMG_OUTPUT_INTEL }} && zip -q -r Playful_apple_silicon.zip Playful.app + cd ${{ env.DMG_OUTPUT_INTEL }} && zip -q -r Playful_intel.zip Playful.app echo "Removing .app" - rm -rf ${{ env.DMG_OUTPUT_INTEL }}/Playful.app + rm -rf ${{ env.DMG_OUTPUT_INTEL }}/Playful_intel.zip - name: Upload Build File uses: actions/upload-artifact@v4 From 461eb4d06b942a9d12e4a833d6043ffe86ec0c88 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:40:53 -0700 Subject: [PATCH 34/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 356d8f3..580b97e 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -26,7 +26,7 @@ jobs: - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: - cmake-version: '3.16.x' + cmake-version: '4.0.x' - name: Show Swift version and architecture run: | From cc51f5cfecdebf58cb888eb738fd89ffd62e49c6 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:41:15 -0700 Subject: [PATCH 35/42] Update CMakeLists.txt --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d440b43..83e9c7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,11 +23,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") target_compile_options(${PROJECT_NAME} PRIVATE -fvisibility=hidden) set_target_properties(${PROJECT_NAME} PROPERTIES XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN "YES") endif() -execute_process( - COMMAND uname -m - OUTPUT_VARIABLE HOST_ARCH - OUTPUT_STRIP_TRAILING_WHITESPACE -) # Link Node.js addon API execute_process(COMMAND node -p "require('node-addon-api').targets" OUTPUT_VARIABLE NODE_ADDON_API_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -65,7 +60,7 @@ add_custom_target(SwiftCode ALL DEPENDS ${SWIFT_OUTPUT}) add_dependencies(${PROJECT_NAME} SwiftCode) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD - COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change ${SWIFT_OUTPUT} "@loader_path/libMediaSubscriber.dylib" MediaSubscriber.node + COMMAND ${CMAKE_INSTALL_NAME_TOOL} "@loader_path/libMediaSubscriber.dylib" MediaSubscriber.node COMMENT "Changing deps" ) From e8d2a89fcd8e9324298702016edec0a91a75a781 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:42:24 -0700 Subject: [PATCH 36/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 580b97e..1811145 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -85,7 +85,7 @@ jobs: - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: - cmake-version: '3.16.x' + cmake-version: '4.0.x' - name: Show Swift version and architecture run: | From 1b9caf8b5a41c5e7a2f41b1cc8aba7a4402c7bcf Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:45:04 -0700 Subject: [PATCH 37/42] Update CMakeLists.txt --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83e9c7f..94cb0d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set(SWIFT_SOURCES ${CMAKE_SOURCE_DIR}/mediaSubscriber.swift) set(SWIFT_OUTPUT ${CMAKE_SOURCE_DIR}/libMediaSubscriber.dylib) add_custom_command( OUTPUT ${SWIFT_OUTPUT} - COMMAND swiftc -emit-library -target ${HOST_ARCH}-apple-macosx11.0 ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} + COMMAND swiftc -emit-library ${SWIFT_SOURCES} -o ${SWIFT_OUTPUT} DEPENDS ${SWIFT_SOURCES} COMMENT "Compiling Swift code" ) @@ -60,7 +60,7 @@ add_custom_target(SwiftCode ALL DEPENDS ${SWIFT_OUTPUT}) add_dependencies(${PROJECT_NAME} SwiftCode) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD - COMMAND ${CMAKE_INSTALL_NAME_TOOL} "@loader_path/libMediaSubscriber.dylib" MediaSubscriber.node + COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change ${SWIFT_OUTPUT} "@loader_path/libMediaSubscriber.dylib" MediaSubscriber.node COMMENT "Changing deps" ) From 343ac2201d637d0545ed9da59277219a8f178024 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 01:50:13 -0700 Subject: [PATCH 38/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 1811145..11eaf2e 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -4,7 +4,7 @@ name: MacOS NodeJS-CMake env: DMG_OUTPUT: ${{github.workspace}}${{ '/out/make/zip/darwin/arm64'}} - DMG_OUTPUT_INTEL: ${{github.workspace}}${{ '/out/make/zip/darwin/x86_64'}} + DMG_OUTPUT_INTEL: ${{github.workspace}}${{ '/out/make/zip/darwin/x64'}} on: push: branches: [ "master" ] From ced6112605d48fca3313d6fcae4bf54c3d270402 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 09:09:19 -0700 Subject: [PATCH 39/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 11eaf2e..92f6b61 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -64,13 +64,13 @@ jobs: echo "Zipping" cd ${{ env.DMG_OUTPUT }} && zip -q -r Playful_apple_silicon.zip Playful.app echo "Removing .app" - rm -rf ${{ env.DMG_OUTPUT }}/Playful_apple_silicon.zip + rm -rf ${{ env.DMG_OUTPUT }}/Playful.app - name: Upload Build File uses: actions/upload-artifact@v4 with: - name: Playful-darwin-amd64 - path: ${{ env.DMG_OUTPUT }}/Playful.app + name: Playful-darwin-arm64 + path: ${{ env.DMG_OUTPUT }}/Playful_apple_silicon.zip IntelBuild: @@ -123,10 +123,10 @@ jobs: echo "Zipping" cd ${{ env.DMG_OUTPUT_INTEL }} && zip -q -r Playful_intel.zip Playful.app echo "Removing .app" - rm -rf ${{ env.DMG_OUTPUT_INTEL }}/Playful_intel.zip + rm -rf ${{ env.DMG_OUTPUT_INTEL }}/Playful.app - name: Upload Build File uses: actions/upload-artifact@v4 with: name: Playful-darwin-intel - path: ${{ env.DMG_OUTPUT_INTEL }}/Playful.app + path: ${{ env.DMG_OUTPUT_INTEL }}/Playful_intel.zip From 35926c5e49a58341a0fa2d2b033c82bd0c381e69 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 09:31:11 -0700 Subject: [PATCH 40/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 92f6b61..5de6687 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: - node-version: [18.x] + node-version: [24.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: @@ -78,7 +78,7 @@ jobs: strategy: matrix: - node-version: [18.x] + node-version: [24.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: From d79e3c9ff76d2e036ce1a5ddc41a570f6b980cd9 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 10:35:36 -0700 Subject: [PATCH 41/42] Zip fix --- .github/workflows/macos_build_m1.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 5de6687..96cf231 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -62,7 +62,7 @@ jobs: echo "Codesigning" codesign --force --deep -s - ${{ env.DMG_OUTPUT }}/Playful.app echo "Zipping" - cd ${{ env.DMG_OUTPUT }} && zip -q -r Playful_apple_silicon.zip Playful.app + cd ${{ env.DMG_OUTPUT }} && zip -q -r -y Playful_apple_silicon.zip Playful.app echo "Removing .app" rm -rf ${{ env.DMG_OUTPUT }}/Playful.app @@ -121,7 +121,7 @@ jobs: echo "Codesigning" codesign --force --deep -s - ${{ env.DMG_OUTPUT_INTEL }}/Playful.app echo "Zipping" - cd ${{ env.DMG_OUTPUT_INTEL }} && zip -q -r Playful_intel.zip Playful.app + cd ${{ env.DMG_OUTPUT_INTEL }} && zip -q -r -y Playful_intel.zip Playful.app echo "Removing .app" rm -rf ${{ env.DMG_OUTPUT_INTEL }}/Playful.app From 1c101c42c5d04ac263f18dba6d217a5a2857a922 Mon Sep 17 00:00:00 2001 From: Athanasios Taprantzis <36666964+thanasis457@users.noreply.github.com> Date: Fri, 11 Jul 2025 10:49:01 -0700 Subject: [PATCH 42/42] Update macos_build_m1.yml --- .github/workflows/macos_build_m1.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/macos_build_m1.yml b/.github/workflows/macos_build_m1.yml index 96cf231..b831c34 100644 --- a/.github/workflows/macos_build_m1.yml +++ b/.github/workflows/macos_build_m1.yml @@ -30,7 +30,6 @@ jobs: - name: Show Swift version and architecture run: | - uname -m swiftc --version file $(which swiftc) arch