Skip to content

Commit c49dfd0

Browse files
test release
1 parent 6ea50b0 commit c49dfd0

File tree

1 file changed

+47
-36
lines changed

1 file changed

+47
-36
lines changed

.github/workflows/github_actions.yml

Lines changed: 47 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ jobs:
106106
ORG_GRADLE_PROJECT_TILEDB_S3: OFF
107107

108108
Create_Artifacts_Windows:
109-
if: startsWith(github.ref, 'refs/tags/') || contains(github.ref, 'test')
110109
needs: [Test_Windows, Examples]
111110
name: Create_Artifacts_Windows
112111
runs-on: windows-2019
@@ -153,14 +152,21 @@ jobs:
153152
ORG_GRADLE_PROJECT_TILEDB_S3: ON
154153

155154
Create_Artifacts_Ubuntu_MacOS:
156-
if: startsWith(github.ref, 'refs/tags/') || contains(github.ref, 'test')
157155
needs: [Test_Ubuntu_macOS, Examples]
158156
name: Create_Artifacts_Ubuntu_MacOS
159157
runs-on: ${{ matrix.os }}
160158
strategy:
161159
matrix:
162160
os: [ macos-11, ubuntu-latest, macos-13-xlarge]
163161
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+
164170
- name: checkout
165171
uses: actions/checkout@v3
166172

@@ -178,9 +184,9 @@ jobs:
178184
if [[ "$RUNNER_OS" == "macOS" ]]; then
179185
if [[ "$(uname -m)" == "arm64" ]]; then
180186
echo "ARM Mac";
181-
mkdir binaries_$RUNNER_OS/arm
187+
mkdir -p binaries_apple_silicon/arm
182188
./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
184190
else
185191
./gradlew -PTILEDB_AZURE=ON assemble
186192
cp ./build/tiledb_jni/*.dylib ./build/install/lib/*.dylib binaries_$RUNNER_OS/
@@ -190,21 +196,15 @@ jobs:
190196
name: 'Build and Upload (Ubuntu and OSX)'
191197
192198
- 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
208208
name: Archive_files
209209
210210
- uses: actions/upload-artifact@v2
@@ -217,13 +217,18 @@ jobs:
217217
with:
218218
name: Upload-Artifact-Mac
219219
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')
221227
env:
222228
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: ON
223229
ORG_GRADLE_PROJECT_TILEDB_S3: ON
224230

225231
Release:
226-
if: startsWith(github.ref, 'refs/tags/')
227232
needs: [Create_Artifacts_Ubuntu_MacOS, Create_Artifacts_Windows]
228233
name: Create-Release
229234
runs-on: ubuntu-latest
@@ -248,7 +253,7 @@ jobs:
248253
mv Upload-*/* .
249254
250255
mkdir -p ./build/install/lib
251-
mkdir .build/install/arm/lib
256+
mkdir -p ./build/install/arm/lib
252257
mkdir ./build/install/lib64
253258
mkdir ./build/tiledb_jni/
254259
mkdir ./build/tiledb_jni/arm
@@ -262,12 +267,18 @@ jobs:
262267
done
263268
264269
mv binaries_*/* .
270+
271+
echo "down";
272+
273+
brew install tree; tree;
265274
266275
# OSX
267276
mv libtiledb.dylib ./build/install/lib
268277
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;
271282
272283
# Linux
273284
cp libtiledb.so ./build/install/lib
@@ -294,20 +305,20 @@ jobs:
294305
tag_name: ${{ github.event.release.tag_name }}
295306
name: ${{ github.event.release.tag_name }}
296307
body: ${{steps.github_release.outputs.changelog}}
297-
draft: false
308+
draft: true
298309
prerelease: false
299310

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 }}
311322
env:
312323
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: ON
313324
ORG_GRADLE_PROJECT_TILEDB_S3: ON

0 commit comments

Comments
 (0)