Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ branchProtectionRules:
- units (11)
- 'Kokoro - Test: Integration'
- cla/google
- 'Kokoro - Test: Java GraalVM Native Image'
- 'Kokoro - Test: Java 17 GraalVM Native Image'
- 'Kokoro - Test: Java GraalVM Native Image A'
- 'Kokoro - Test: Java GraalVM Native Image B'
- 'Kokoro - Test: Java GraalVM Native Image C'
- javadoc
- unmanaged_dependency_check
- pattern: java7
Expand Down
6 changes: 1 addition & 5 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ javadoc)
integration)
mvn -B ${INTEGRATION_TEST_ARGS} \
-ntp \
-Dprotobuf.version=4.29.4 \
-Penable-integration-tests \
-DtrimStackTrace=false \
-Dclirr.skip=true \
Expand All @@ -77,11 +78,6 @@ graalvm)
mvn test -Pnative -Penable-integration-tests
RETURN_CODE=$?
;;
graalvm17)
# Run Unit and Integration Tests with Native Image
mvn test -Pnative -Penable-integration-tests
RETURN_CODE=$?
;;
samples)
SAMPLES_DIR=samples
# only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env_vars: {

env_vars: {
key: "JOB_TYPE"
value: "graalvm17"
value: "graalvm"
}

# TODO: remove this after we've migrated all tests and scripts
Expand Down
33 changes: 33 additions & 0 deletions .kokoro/presubmit/graalvm-native-c.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2"
}

env_vars: {
key: "JOB_TYPE"
value: "graalvm"
}

# TODO: remove this after we've migrated all tests and scripts
env_vars: {
key: "GCLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_CLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-it-service-account"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-it-service-account"
}
4 changes: 2 additions & 2 deletions google-cloud-nio-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-nio-bom</artifactId>
<version>0.127.34</version><!-- {x-version-update:google-cloud-nio:current} -->
<version>0.127.35-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
<packaging>pom</packaging>
<parent>
<groupId>com.google.cloud</groupId>
Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-nio</artifactId>
<version>0.127.34</version><!-- {x-version-update:google-cloud-nio:current} -->
<version>0.127.35-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-nio-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-nio-examples</artifactId>
<version>0.127.34</version><!-- {x-version-update:google-cloud-nio:current} -->
<version>0.127.35-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
<packaging>jar</packaging>
<name>Google Cloud NIO Examples</name>
<url>https://github.com/googleapis/java-storage-nio</url>
Expand All @@ -13,7 +13,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-nio-parent</artifactId>
<version>0.127.34</version><!-- {x-version-update:google-cloud-nio:current} -->
<version>0.127.35-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-nio-retrofit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-nio-retrofit</artifactId>
<version>0.127.34</version><!-- {x-version-update:google-cloud-nio:current} -->
<version>0.127.35-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
<packaging>jar</packaging>
<name>Google Cloud NIO Retrofit Example</name>
<url>https://github.com/googleapis/java-storage-nio</url>
Expand All @@ -12,7 +12,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-nio-parent</artifactId>
<version>0.127.34</version><!-- {x-version-update:google-cloud-nio:current} -->
<version>0.127.35-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-nio-retrofit</site.installationModule>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-nio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-nio</artifactId>
<version>0.127.34</version><!-- {x-version-update:google-cloud-nio:current} -->
<version>0.127.35-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
<packaging>jar</packaging>
<name>Google Cloud NIO</name>
<url>https://github.com/googleapis/java-storage-nio</url>
Expand All @@ -12,7 +12,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-nio-parent</artifactId>
<version>0.127.34</version><!-- {x-version-update:google-cloud-nio:current} -->
<version>0.127.35-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-nio</site.installationModule>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-nio-parent</artifactId>
<packaging>pom</packaging>
<version>0.127.34</version><!-- {x-version-update:google-cloud-nio:current} -->
<version>0.127.35-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
<name>Storage Parent</name>
<url>https://github.com/googleapis/java-storage-nio</url>
<description>
Expand Down
2 changes: 1 addition & 1 deletion samples/install-without-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-nio</artifactId>
<version>0.127.32</version>
<version>0.127.34</version>
</dependency>
<!-- [END storage_nio_install_without_bom] -->

Expand Down
2 changes: 1 addition & 1 deletion samples/snapshot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-nio</artifactId>
<version>0.127.34</version>
<version>0.127.35-SNAPSHOT</version>
</dependency>
<!-- {x-version-update-end} -->

Expand Down
2 changes: 1 addition & 1 deletion versions.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version

google-cloud-nio:0.127.34:0.127.34
google-cloud-nio:0.127.34:0.127.35-SNAPSHOT