Skip to content

fix maven empty upload #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DimitrisStaratzis merged 1 commit into from
Oct 17, 2023
Merged

fix maven empty upload #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 14 additions & 55 deletions .github/workflows/github_actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,10 @@ jobs:
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: ON
ORG_GRADLE_PROJECT_TILEDB_S3: ON

Setup-Release:
Mock-Release:
if: startsWith(github.ref, 'refs/tags/')
needs: [Create_Artifacts_Ubuntu_MacOS, Create_Artifacts_Windows]
name: Setup-Release
name: Mock-Release
runs-on: ubuntu-latest
steps:

Expand All @@ -248,48 +248,10 @@ jobs:

- uses: actions/download-artifact@v2

- name: Create-Jars
- name: assemble
run: |
set +e

mv Upload-*/* .

mkdir -p ./build/install/lib
mkdir -p ./build/install/arm/lib
mkdir ./build/install/lib64
mkdir ./build/tiledb_jni/
mkdir ./build/tiledb_jni/arm
mkdir ./build/tiledb_jni/Release
mkdir ./build/install/bin


for arch in $(ls | grep .gz.tar)
do
tar -xvf $arch
done

mv binaries_*/* .

# OSX
mv libtiledb.dylib ./build/install/lib
mv libtiledbjni.dylib ./build/tiledb_jni
mv arm/libtiledb.dylib ./build/install/arm/lib
mv arm/libtiledbjni.dylib ./build/tiledb_jni/arm

# Linux
cp libtiledb.so ./build/install/lib
mv libtiledb.so ./build/install/lib64
mv libtiledbjni.so ./build/tiledb_jni

# Windows
mv tbb.dll ./build/install/bin
mv tiledb.dll ./build/install/bin
mv tiledbjni.dll ./build/tiledb_jni/Release

./gradlew assemble

mkdir jars
cp ./build/libs/*.jar jars
chmod +x ./ci/assemble_full_jar.sh
./ci/assemble_full_jar.sh

- uses: actions/upload-artifact@v3
with:
Expand All @@ -301,10 +263,10 @@ jobs:
ORG_GRADLE_PROJECT_TILEDB_S3: ON


Test-Release:
Test-Mock-Release:
if: startsWith(github.ref, 'refs/tags/')
needs: [ Setup-Release ]
name: Test-Release
needs: [ Mock-Release ]
name: Test-Mock-Release
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand Down Expand Up @@ -353,24 +315,21 @@ jobs:
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: ON
ORG_GRADLE_PROJECT_TILEDB_S3: ON

Release:
if: startsWith(github.ref, 'refs/tags/')
needs: [ Test-Release ]
name: Release
Actual-Release:
needs: [ Test-Mock-Release ]
name: Actual-Release
runs-on: ubuntu-latest
steps:

- name: Checkout
uses: actions/checkout@v3

- uses: actions/download-artifact@v2
with:
name: jars

- name: Package jars
- name: assemble
run: |
mkdir jars;
mv *.jar ./jars;
chmod +x ./ci/assemble_full_jar.sh;
./ci/assemble_full_jar.sh;

- name: Create Release
id: create_release
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
}

group 'io.tiledb'
version '0.19.0-SNAPSHOT'
version '0.19.1-SNAPSHOT'

repositories {
jcenter()
Expand Down
42 changes: 42 additions & 0 deletions ci/assemble_full_jar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!/usr/bin/env bash

set +e

mv Upload-*/* .

mkdir -p ./build/install/lib
mkdir -p ./build/install/arm/lib
mkdir ./build/install/lib64
mkdir ./build/tiledb_jni/
mkdir ./build/tiledb_jni/arm
mkdir ./build/tiledb_jni/Release
mkdir ./build/install/bin


for arch in $(ls | grep .gz.tar)
do
tar -xvf $arch
done

mv binaries_*/* .

# OSX
mv libtiledb.dylib ./build/install/lib
mv libtiledbjni.dylib ./build/tiledb_jni
mv arm/libtiledb.dylib ./build/install/arm/lib
mv arm/libtiledbjni.dylib ./build/tiledb_jni/arm

# Linux
cp libtiledb.so ./build/install/lib
Copy link
Member

@ihnorton ihnorton Oct 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary to make the change in this PR, but at some point soon we should change the structure to use specific subdirectories for each os/architecture.

mv libtiledb.so ./build/install/lib64
mv libtiledbjni.so ./build/tiledb_jni

# Windows
mv tbb.dll ./build/install/bin
mv tiledb.dll ./build/install/bin
mv tiledbjni.dll ./build/tiledb_jni/Release

./gradlew assemble

mkdir jars
cp ./build/libs/*.jar jars