diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index cbaa5ff..6adb461 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -22,6 +22,9 @@ jobs: os: ubuntu-latest glecs_lib: libglecs.so # Mac + - target: aarch64-apple-darwin + os: macos-latest + glecs_lib: libglecs.dylib - target: x86_64-apple-darwin os: macos-latest glecs_lib: libglecs.dylib @@ -31,9 +34,13 @@ jobs: glecs_lib: glecs.dll runs-on: ${{ matrix.os }} outputs: + # Linux x86_64-linux_lib_cache_key: ${{ steps.set_cache_key.outputs.x86_64-unknown-linux-gnu_lib_cache_key }} i686-linux_lib_cache_key: ${{ steps.set_cache_key.outputs.i686-unknown-linux-gnu_lib_cache_key }} - x86_64-mac_lib_cache_key: ${{ steps.set_cache_key.outputs.x86_64-apple-darwin_lib_cache_key }} + # Mac + aarch64-mac_lib_cache_key: ${{ steps.set_cache_key.outputs.x86_64-apple-darwin_lib_cache_key }} + x86_64-mac_lib_cache_key: ${{ steps.set_cache_key.outputs.aarch64-apple-darwin_lib_cache_key }} + # Windows x86_64-windows_lib_cache_key: ${{ steps.set_cache_key.outputs.x86_64-pc-windows-gnu_lib_cache_key }} steps: - name: 🐙 Settup git environment @@ -167,6 +174,16 @@ jobs: # An optional boolean when enabled, allows windows runners to save or restore caches that can be restored or saved respectively on other platforms enableCrossOsArchive: true + - name: 🍎 Load compiled library, Mac aarch64 + uses: actions/cache/restore@v4.0.2 + with: + # A list of files, directories, and wildcard patterns to cache and restore + path: ./addons/glecs/bin/aarch64-apple-darwin/release/libglecs.dylib + # An explicit key for restoring and saving the cache + key: ${{ needs.compile_glecs.outputs.aarch64-mac_lib_cache_key }} + # An optional boolean when enabled, allows windows runners to save or restore caches that can be restored or saved respectively on other platforms + enableCrossOsArchive: true + - name: 🍎 Load compiled library, Mac x86_64 uses: actions/cache/restore@v4.0.2 with: diff --git a/addons/glecs/glecs.gdextension.release b/addons/glecs/glecs.gdextension.release index 09d66cf..08c0ccd 100644 --- a/addons/glecs/glecs.gdextension.release +++ b/addons/glecs/glecs.gdextension.release @@ -11,7 +11,7 @@ linux.debug.x86_64 = "./bin/x86_64-unknown-linux-gnu/release/libglecs.so" windows.release.x86_64 = "./bin/x86_64-pc-windows-gnu/release/glecs.dll" windows.debug.x86_64 = "./bin/x86_64-pc-windows-gnu/release/glecs.dll" +macos.release.arm64 = "./bin/aarch64-apple-darwin/release/libglecs.dylib" +macos.debug.arm64 = "./bin/aarch64-apple-darwin/release/libglecs.dylib" macos.release.x86_64 = "./bin/x86_64-apple-darwin/release/libglecs.dylib" -macos.debug.x86_64 = "./bin/x86_64-apple-darwin/release/libglecs.dylib" -macos.release.arm64 = "./bin/x86_64-apple-darwin/release/libglecs.dylib" -macos.debug.arm64 = "./bin/x86_64-apple-darwin/release/libglecs.dylib" \ No newline at end of file +macos.debug.x86_64 = "./bin/x86_64-apple-darwin/release/libglecs.dylib" \ No newline at end of file