From f10573a4782f81b1b4aa161ca4104ccad0cc68d8 Mon Sep 17 00:00:00 2001 From: Maciej Gajek Date: Mon, 18 Dec 2023 15:30:24 +0100 Subject: [PATCH 1/4] NIT: Update Gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 841f9b7..d5e843d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ **/target out/ .bsp/ +.metals/ +.vscode/ +.bloop/ From 0928e61778979a56e7b858290fb936db3e36dbd3 Mon Sep 17 00:00:00 2001 From: Maciej Gajek Date: Thu, 21 Dec 2023 11:22:02 +0100 Subject: [PATCH 2/4] Update resource path for M1 MacOS --- .../src/main/java/libsodiumjni/internal/LoadLibrary.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libsodiumjni/src/main/java/libsodiumjni/internal/LoadLibrary.java b/libsodiumjni/src/main/java/libsodiumjni/internal/LoadLibrary.java index 45b3dec..fa6be47 100644 --- a/libsodiumjni/src/main/java/libsodiumjni/internal/LoadLibrary.java +++ b/libsodiumjni/src/main/java/libsodiumjni/internal/LoadLibrary.java @@ -20,8 +20,11 @@ public static void initialize(String libraryPath) { } public static String resourcePath() { + Boolean isArmArch = System.getProperty("os.arch").toLowerCase(Locale.ROOT).contains("aarch64"); + String osName = System.getProperty("os.name").toLowerCase(Locale.ROOT); if (osName.contains("linux")) return "META-INF/native/linux64/libsodiumjni.so"; + else if (osName.contains("mac") && isArmArch) return "META-INF/native/arm-darwin/libsodiumjni.dylib"; else if (osName.contains("mac")) return "META-INF/native/darwin/libsodiumjni.dylib"; else if (osName.contains("windows")) return "META-INF/native/windows64/libsodiumjni.dll"; else From 3068ce596fe2325948d57be14fc96b64e8857dc4 Mon Sep 17 00:00:00 2001 From: Maciej Gajek Date: Thu, 21 Dec 2023 11:45:59 +0100 Subject: [PATCH 3/4] Update actions/checkout to v4 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d95098..e713212 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: true @@ -53,7 +53,7 @@ jobs: runs-on: ARM64 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: true @@ -84,7 +84,7 @@ jobs: if: github.event_name == 'push' steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: true From d16ee5f939951e6134e612b3d34f1ad970203327 Mon Sep 17 00:00:00 2001 From: Maciej Gajek Date: Thu, 21 Dec 2023 12:02:37 +0100 Subject: [PATCH 4/4] Remove workaround --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e713212..d49feb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,12 +27,6 @@ jobs: - name: Install libsodium (Linux) if: runner.os == 'Linux' run: sudo apt-get install -y libsodium-dev - - name: Update XCode version - if: runner.os == 'macOS' - # https://github.com/actions/virtual-environments/issues/2557 - run: | - sudo xcode-select -s "/Applications/Xcode_12.5.app" || sudo xcode-select -s "/Applications/Xcode_12.3.app" || ( ls /Applications; exit 1 ) - sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* - name: Run tests run: ./mill -i __.test - name: Build and publish locally