Skip to content

Commit

Permalink
Merge pull request #6 from MaciejG604/release-0.0.4
Browse files Browse the repository at this point in the history
Prepare for release 0.0.4
  • Loading branch information
Gedochao authored Dec 21, 2023
2 parents e90c466 + d16ee5f commit afaf2c2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -53,7 +47,7 @@ jobs:
runs-on: ARM64
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand Down Expand Up @@ -84,7 +78,7 @@ jobs:
if: github.event_name == 'push'
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
**/target
out/
.bsp/
.metals/
.vscode/
.bloop/
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit afaf2c2

Please sign in to comment.