Skip to content

fix mock release test #322

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.

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
merged 31 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b44eaf7
fix mock release test
DimitrisStaratzis Nov 22, 2023
00094aa
enable full logging
DimitrisStaratzis Nov 22, 2023
c13198b
revert CXX standard to 11
DimitrisStaratzis Nov 22, 2023
1558654
add log print
DimitrisStaratzis Nov 22, 2023
63199ae
set +e in examples
DimitrisStaratzis Nov 22, 2023
e773bfc
remove +e and add if: always()
DimitrisStaratzis Nov 22, 2023
f4463e4
try printing version
DimitrisStaratzis Nov 22, 2023
f59874f
native lib loader changes
DimitrisStaratzis Nov 22, 2023
967d870
remove set +e from assembling full jar script
DimitrisStaratzis Nov 22, 2023
aea7591
use java 17
DimitrisStaratzis Nov 22, 2023
c9cda23
use new bindings and revert to java 11
DimitrisStaratzis Nov 22, 2023
f0c8b2a
check gcc version
DimitrisStaratzis Nov 22, 2023
502faa0
adding debug comments
DimitrisStaratzis Nov 22, 2023
2863dc3
more comments
DimitrisStaratzis Nov 22, 2023
f94d49b
validate that error is in the aarch detection
DimitrisStaratzis Nov 22, 2023
c66486e
update to java 17
DimitrisStaratzis Nov 27, 2023
d3b8f27
update to gradle 7.6.2
DimitrisStaratzis Nov 27, 2023
6cc1933
update setup java to v3
DimitrisStaratzis Nov 27, 2023
b4e34da
add duplicate strategy in build.gradle
DimitrisStaratzis Nov 27, 2023
69d4a61
remove log printing
DimitrisStaratzis Nov 27, 2023
6205128
check getResource() for bug
DimitrisStaratzis Nov 27, 2023
54ea229
more comments
DimitrisStaratzis Nov 27, 2023
aa492fe
try with "/" in front
DimitrisStaratzis Nov 27, 2023
85896c4
try full CI
DimitrisStaratzis Nov 27, 2023
2f2b203
revert to java 11 for CI with gradle 6 and format
DimitrisStaratzis Nov 27, 2023
aedb9eb
use adopt
DimitrisStaratzis Nov 27, 2023
b57b849
add macos13 to mock release test
DimitrisStaratzis Nov 27, 2023
a190d65
remove members test or now
DimitrisStaratzis Nov 28, 2023
d3ef682
finalize PR
DimitrisStaratzis Nov 28, 2023
109a356
get CI back to final form
DimitrisStaratzis Nov 28, 2023
f9061a1
use both name and uri for the ```removeMember()``` method
DimitrisStaratzis Nov 28, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/github_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ jobs:
uses: actions/checkout@v3

- name: Set-up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'
Expand Down Expand Up @@ -265,14 +265,14 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ macos-11, ubuntu-latest, macos-13-xlarge, windows-2019 ]
os: [ ubuntu-latest, macos-13, macos-13-xlarge, windows-2019 ]
steps:

- name: Checkout
uses: actions/checkout@v3

- name: Set-up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'
Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,12 @@ test {

testLogging {
showStandardStreams = true
exceptionFormat = 'full'
}
}

jar {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
// macOS arm
into(new File('arm/lib').toString()) {
from file("$buildDir/install/arm/lib/libtiledb.dylib")
Expand Down
2 changes: 0 additions & 2 deletions ci/assemble_full_jar.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/env bash

set +e

mv Upload-*/* .

mkdir -p ./build/install/lib
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pluginManagement {
eachPlugin {

if(requested.id.namespace == 'com.google' && requested.id.name == 'osdetector') {
useModule 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
useModule 'com.google.gradle:osdetector-gradle-plugin:1.7.0'
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/tiledb/java/api/Group.java
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,11 @@ public void addMember(String uri, boolean relative, String name) throws TileDBEr
/**
* Remove a member from a group.
*
* @param name The name of the member to remove
* @param nameOrUri The name or URI of the member to remove
* @throws TileDBError
*/
public void removeMember(String name) throws TileDBError {
ctx.handleError(tiledb.tiledb_group_remove_member(ctx.getCtxp(), getGroupp(), name));
public void removeMember(String nameOrUri) throws TileDBError {
ctx.handleError(tiledb.tiledb_group_remove_member(ctx.getCtxp(), getGroupp(), nameOrUri));
}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/tiledb/libtiledb/NativeLibLoader.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/main/java/io/tiledb/libtiledb/tiledb.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/test/java/io/tiledb/java/api/GroupTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,12 @@ public void membersTest() throws Exception {

// remove a member
group.reopen(ctx, TILEDB_WRITE);
group.removeMember("array2Name");
group.removeMember("array2");
group.removeMember("array3Name");

// check if member is removed
group.reopen(ctx, QueryType.TILEDB_READ);
Assert.assertEquals(2, group.getMemberCount());
Assert.assertEquals(1, group.getMemberCount());
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions swig/customCode/NativeLibLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ static void loadNativeTileDBJNI() {
try {
loadNativeLib("tiledbjni", true);
} catch (java.lang.UnsatisfiedLinkError e) {
LOGGER.warning("Could not load Native TileDB JNI");
// If a native library fails to link, we fall back to depending on the system
// dynamic linker to satisfy the requirement. Therefore, we do nothing here
// (if the library is not available via the system linker, a runtime error
Expand Down Expand Up @@ -323,13 +324,12 @@ private static Path findNativeLibrary(String libraryName, boolean mapLibraryName
String mappedLibraryName = mapLibraryName ? System.mapLibraryName(libraryName) : libraryName;
String libDir = LIB_RESOURCE_DIR;

if (System.getProperty("os.name").contains("mac")
if (System.getProperty("os.name").contains("Mac")
&& System.getProperty("os.arch").equals("aarch64")) {
libDir = "arm" + libDir;
libDir = "/arm" + libDir;
}

String libPath = libDir + "/" + mappedLibraryName;

boolean hasNativeLib = hasResource(libPath);
if (!hasNativeLib) {
return null;
Expand Down