Skip to content

Commit 905c1ef

Browse files
add native support for Apple Silicon macs
1 parent e8e6d34 commit 905c1ef

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

.github/workflows/github_actions.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,19 @@ jobs:
4040
runs-on: ${{ matrix.os }}
4141
strategy:
4242
matrix:
43-
os: [ ubuntu-latest, macos-11 ]
43+
os: [ ubuntu-latest, macos-11, macos-13-xlarge ]
4444

4545
steps:
4646
- name: checkout
4747
uses: actions/checkout@v3
4848

49+
- name: Set up Java
50+
uses: actions/setup-java@v3
51+
with:
52+
distribution: 'adopt'
53+
java-version: '11'
54+
check-latest: true
55+
4956
- run: |
5057
unset SYSTEM
5158
./gradlew checkFormat
@@ -64,21 +71,6 @@ jobs:
6471
shell: bash
6572
name: test
6673
67-
- run: |
68-
set -e pipefail
69-
# Display log files if the build failed
70-
echo "Dumping log files for failed build"
71-
echo "----------------------------------"
72-
for f in $(find $BUILD_REPOSITORY_LOCALPATH -name *.dumpstream);
73-
do echo "------"
74-
echo $f
75-
echo "======"
76-
cat $f
77-
done;
78-
shell: bash
79-
name: error_print
80-
if: ${{ failure() }}
81-
8274
env:
8375
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: OFF
8476
ORG_GRADLE_PROJECT_TILEDB_S3: OFF

cmake/Modules/FindTileDB_EP.cmake

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,15 @@ if (NOT TILEDB_FOUND)
5151
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.3/tiledb-windows-x86_64-2.16.3-194b5ae.zip")
5252
SET(DOWNLOAD_SHA1 "8e986b6143ef9509201c7f2b3c0a7a53ff41095a")
5353
elseif(APPLE) # macOS
54-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.3/tiledb-macos-x86_64-2.16.3-194b5ae.tar.gz")
55-
SET(DOWNLOAD_SHA1 "b4d35306771d1c30b49bf2a98651e8e24c91037e")
54+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
55+
message(STATUS "Building for intel mac")
56+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.3/tiledb-macos-x86_64-2.16.3-194b5ae.tar.gz")
57+
SET(DOWNLOAD_SHA1 "b4d35306771d1c30b49bf2a98651e8e24c91037e")
58+
else()
59+
message(STATUS "Building for apple silicon mac")
60+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.3/tiledb-macos-arm64-2.16.3-194b5ae.tar.gz")
61+
SET(DOWNLOAD_SHA1 "1f3f0e7660ed54b8988bdfcc4876021bf57d58da")
62+
endif()
5663
else() # Linux
5764
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.3/tiledb-linux-x86_64-2.16.3-194b5ae.tar.gz")
5865
SET(DOWNLOAD_SHA1 "6ccafbee52137478d0b8146e71a11323755c9ed5")

src/main/c/custom/tiledb_custom.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ extern "C" {
706706

707707
(void)jenv;
708708
(void)jcls;
709-
if (!SWIG_JavaArrayInLonglong(jenv, &jarr1, (long long **)&arg1, jarg1)) return 0;
709+
if (!SWIG_JavaArrayInLonglong(jenv, &jarr1, (jlong**)&arg1, jarg1)) return 0;
710710
SWIG_JavaArrayArgoutLonglong(jenv, jarr1, arg1, jarg1);
711711
*(void **)&jresult = (void *)arg1;
712712
return jresult;

0 commit comments

Comments
 (0)