Download universal MacOS shared library (#279)

This ensures that the M1 processor is supported MONGOCRYPT-418
mongodb · Apr 18, 2022 · 3f3e88b · 3f3e88b
1 parent 9ce232c
commit 3f3e88b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -429,14 +429,18 @@ tasks:
       name: prep-c-driver-source
     - variant: rhel-62-64-bit
       name: build-and-test-java
+    - variant: rhel-62-64-bit
+      name: build-and-test-and-upload
     - variant: rhel-67-s390x
       name: build-and-test-and-upload
     - variant: ubuntu1604-arm64
       name: build-and-test-java
-    # JAVA-4445 use the "macos" univeral build instead of the "macos_x86_64" build.
-    # Currently the variant named "macos" does not run the build-and-test-java task.
+    - variant: ubuntu1604-arm64
+      name: build-and-test-and-upload
     - variant: macos_x86_64
       name: build-and-test-java
+    - variant: macos
+      name: build-and-test-and-upload
     - variant: windows-test
       name: build-and-test-and-upload # Todo update once java build passing on windows
   commands:

diff --git a/bindings/java/mongocrypt/build.gradle.kts b/bindings/java/mongocrypt/build.gradle.kts
@@ -135,7 +135,7 @@ val jnaMappingList: List<LibMongoCryptS3Data> = listOf(
         LibMongoCryptS3Data("rhel-67-s390x", "linux-s390x"),
         LibMongoCryptS3Data("ubuntu1604-arm64", "linux-aarch64"),
         LibMongoCryptS3Data("windows-test", "win32-x86-64"),
-        LibMongoCryptS3Data("macos_x86_64", "darwin")
+        LibMongoCryptS3Data("macos", "darwin")
 )
 
 jnaMappingList.forEach {