@@ -106,7 +106,6 @@ jobs:
106
106
ORG_GRADLE_PROJECT_TILEDB_S3 : OFF
107
107
108
108
Create_Artifacts_Windows :
109
- if : startsWith(github.ref, 'refs/tags/') || contains(github.ref, 'test')
110
109
needs : [Test_Windows, Examples]
111
110
name : Create_Artifacts_Windows
112
111
runs-on : windows-2019
@@ -153,14 +152,21 @@ jobs:
153
152
ORG_GRADLE_PROJECT_TILEDB_S3 : ON
154
153
155
154
Create_Artifacts_Ubuntu_MacOS :
156
- if : startsWith(github.ref, 'refs/tags/') || contains(github.ref, 'test')
157
155
needs : [Test_Ubuntu_macOS, Examples]
158
156
name : Create_Artifacts_Ubuntu_MacOS
159
157
runs-on : ${{ matrix.os }}
160
158
strategy :
161
159
matrix :
162
160
os : [ macos-11, ubuntu-latest, macos-13-xlarge]
163
161
steps :
162
+
163
+ - name : Set up Java
164
+ uses : actions/setup-java@v3
165
+ with :
166
+ distribution : ' adopt'
167
+ java-version : ' 11'
168
+ check-latest : true
169
+
164
170
- name : checkout
165
171
uses : actions/checkout@v3
166
172
@@ -178,9 +184,9 @@ jobs:
178
184
if [[ "$RUNNER_OS" == "macOS" ]]; then
179
185
if [[ "$(uname -m)" == "arm64" ]]; then
180
186
echo "ARM Mac";
181
- mkdir binaries_$RUNNER_OS /arm
187
+ mkdir -p binaries_apple_silicon /arm
182
188
./gradlew -PTILEDB_AZURE=ON assemble
183
- cp ./build/tiledb_jni/arm/*.dylib ./build/install/arm/lib/*.dylib binaries_$RUNNER_OS /arm
189
+ cp ./build/tiledb_jni/arm/*.dylib ./build/install/arm/lib/*.dylib binaries_apple_silicon /arm
184
190
else
185
191
./gradlew -PTILEDB_AZURE=ON assemble
186
192
cp ./build/tiledb_jni/*.dylib ./build/install/lib/*.dylib binaries_$RUNNER_OS/
@@ -190,21 +196,15 @@ jobs:
190
196
name: 'Build and Upload (Ubuntu and OSX)'
191
197
192
198
- run : |
193
- set -e pipefail
194
- # Display log files if the build failed
195
- echo "Dumping log files for failed build"
196
- echo "----------------------------------"
197
- for f in $(find $BUILD_REPOSITORY_LOCALPATH -name *.log);
198
- do echo "------"
199
- echo $f
200
- echo "======"
201
- cat $f
202
- done;
203
- if: ${{ failure() }}
204
- name: "Print log files (failed build only)"
205
-
206
- - run : |
207
- tar cvf tiledb-$RUNNER_OS.gz.tar binaries_$RUNNER_OS/
199
+ if [[ "$RUNNER_OS" == "macOS" ]]; then
200
+ if [[ "$(uname -m)" == "arm64" ]]; then
201
+ tar cvf tiledb-apple-silicon.gz.tar binaries_apple_silicon/
202
+ else
203
+ tar cvf tiledb-$RUNNER_OS.gz.tar binaries_$RUNNER_OS/
204
+ fi
205
+ else
206
+ tar cvf tiledb-$RUNNER_OS.gz.tar binaries_$RUNNER_OS/
207
+ fi
208
208
name: Archive_files
209
209
210
210
- uses : actions/upload-artifact@v2
@@ -217,13 +217,18 @@ jobs:
217
217
with :
218
218
name : Upload-Artifact-Mac
219
219
path : ' *.gz.tar'
220
- if : runner.os == 'macOS'
220
+ if : runner.os == 'macOS' && (runner.arch == 'X86' || runner.arch == 'X64')
221
+
222
+ - uses : actions/upload-artifact@v2
223
+ with :
224
+ name : Upload-Artifact-Mac-Arm
225
+ path : ' *.gz.tar'
226
+ if : runner.os == 'macOS' && (runner.arch == 'ARM' || runner.arch == 'arm64')
221
227
env :
222
228
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION : ON
223
229
ORG_GRADLE_PROJECT_TILEDB_S3 : ON
224
230
225
231
Release :
226
- if : startsWith(github.ref, 'refs/tags/')
227
232
needs : [Create_Artifacts_Ubuntu_MacOS, Create_Artifacts_Windows]
228
233
name : Create-Release
229
234
runs-on : ubuntu-latest
@@ -248,7 +253,7 @@ jobs:
248
253
mv Upload-*/* .
249
254
250
255
mkdir -p ./build/install/lib
251
- mkdir . build/install/arm/lib
256
+ mkdir -p ./ build/install/arm/lib
252
257
mkdir ./build/install/lib64
253
258
mkdir ./build/tiledb_jni/
254
259
mkdir ./build/tiledb_jni/arm
@@ -262,12 +267,18 @@ jobs:
262
267
done
263
268
264
269
mv binaries_*/* .
270
+
271
+ echo "down";
272
+
273
+ brew install tree; tree;
265
274
266
275
# OSX
267
276
mv libtiledb.dylib ./build/install/lib
268
277
mv libtiledbjni.dylib ./build/tiledb_jni
269
- mv arm/libtiledb.dylib .build/install/arm/lib
270
- mv arm/libtiledbjni.dylib .build/tiledb_jni/arm
278
+ mv arm/libtiledb.dylib ./build/install/arm/lib
279
+ mv arm/libtiledbjni.dylib ./build/tiledb_jni/arm
280
+
281
+ tree;
271
282
272
283
# Linux
273
284
cp libtiledb.so ./build/install/lib
@@ -294,20 +305,20 @@ jobs:
294
305
tag_name : ${{ github.event.release.tag_name }}
295
306
name : ${{ github.event.release.tag_name }}
296
307
body : ${{steps.github_release.outputs.changelog}}
297
- draft : false
308
+ draft : true
298
309
prerelease : false
299
310
300
- - name : Upload to maven
301
- run : |
302
- chmod +x ./ci/upload_to_maven.sh
303
- ./ci/upload_to_maven.sh
304
- shell : bash
305
- env :
306
- GPG_KEY_ID : ${{ secrets.GPG_KEY_ID }}
307
- GPG_PASSPHRASE : ${{ secrets.GPG_PASSPHRASE }}
308
- GPG_SECRET_KEYS_ENC : ${{ secrets.GPG_SECRET_KEYS_ENC }}
309
- SONATYPE_USERNAME : ${{ secrets.SONATYPE_USERNAME }}
310
- SONATYPE_PASSWORD : ${{ secrets.SONATYPE_PASSWORD }}
311
+ # - name: Upload to maven
312
+ # run: |
313
+ # chmod +x ./ci/upload_to_maven.sh
314
+ # ./ci/upload_to_maven.sh
315
+ # shell: bash
316
+ # env:
317
+ # GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
318
+ # GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
319
+ # GPG_SECRET_KEYS_ENC: ${{ secrets.GPG_SECRET_KEYS_ENC }}
320
+ # SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
321
+ # SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
311
322
env :
312
323
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION : ON
313
324
ORG_GRADLE_PROJECT_TILEDB_S3 : ON
0 commit comments