Skip to content
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

chore: add native-image-shared-config as parent #1908

Merged
merged 11 commits into from
Dec 12, 2023
Merged

chore: add native-image-shared-config as parent #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
74d0587
chore: add native image config as parent
mpeddada1 Nov 16, 2023
de56925
update native-image-shared-config to released version
mpeddada1 Dec 8, 2023
84faac3
add native profile to include **Tests
mpeddada1 Dec 8, 2023
454d046
use version agnostic graalvm versions
mpeddada1 Dec 8, 2023
45be21a
fix repo name
mpeddada1 Dec 8, 2023
0f6f243
add renovate bot config to update cfg files
mpeddada1 Dec 11, 2023
f76baa0
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Dec 11, 2023
f17fded
exclude renovate.json from owlbot
mpeddada1 Dec 11, 2023
7f75542
Merge branch 'main' into parent-native-image-config
mpeddada1 Dec 11, 2023
2fef0f8
use native-image-shared-config
mpeddada1 Dec 11, 2023
c5e64ee
Merge branch 'parent-native-image-config' of github.com:googleapis/go…
mpeddada1 Dec 11, 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
4 changes: 2 additions & 2 deletions .kokoro/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ graalvm17)
;;
graalvmA)
# Run Unit and Integration Tests with Native Image
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative,native-tests,native-deps test -pl '!google-http-client-appengine'
RETURN_CODE=$?
;;
graalvmB)
# Run Unit and Integration Tests with Native Image
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-deps test -pl '!google-http-client-appengine'
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative,native-tests,native-deps test -pl '!google-http-client-appengine'
RETURN_CODE=$?
;;
samples)
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-a.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
value: "gcr.io/cloud-devrel-public-resources/graalvm_a:1.7.1"
Copy link
Member

Choose a reason for hiding this comment

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

Should these graalvm-native-x.cfgs have a dependabot/renovatebot comment to tie the version to native-image-shared-config?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point, enabled renovate-bot to update the java-shared-config version. Tested at mpeddada1/forking-renovate-repro#8

}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-b.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
value: "gcr.io/cloud-devrel-public-resources/graalvm_b:1.7.1"
}

env_vars: {
Expand Down
1 change: 1 addition & 0 deletions owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"license-checks.xml",
".github/workflows/samples.yaml",
".kokoro/build.sh",
"renovate.json",
".github/workflows/ci.yaml"
]
)
52 changes: 11 additions & 41 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@
</pluginRepository>
</pluginRepositories>

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>native-image-shared-config</artifactId>
<version>1.7.1</version>
</parent>

<!--
If you change the version of a dependency, make sure to update the javadoc
links if required, and any javadoc links of your dependency in the oauth and
Expand Down Expand Up @@ -587,59 +593,23 @@

<profiles>
<profile>
<!-- This profile is used to enable GraalVM native image testing -->
<id>native</id>
<dependencies>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>junit-platform-native</artifactId>
<version>0.9.23</version>
<scope>test</scope>
</dependency>
</dependencies>
<id>native-tests</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Must use older version of surefire plugin for native-image testing. -->
<version>2.22.2</version>
<version>${surefire.version}</version>
<configuration>
<!-- Include all tests during native image testing. -->
<excludes combine.self="override"/>
</configuration>
</plugin>
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>0.9.23</version>
<extensions>true</extensions>
<executions>
<execution>
<id>test-native</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
<configuration>
<buildArgs>
<buildArg>--no-fallback</buildArg>
<buildArg>--no-server</buildArg>
</buildArgs>
<includes combine.self="override">
<include>**/*Test</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>Windows</id>
<activation>
Expand Down
11 changes: 11 additions & 0 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@
":autodetectPinVersions"
],
"ignorePaths": [".kokoro/requirements.txt"],
"customManagers": [
{
"customType": "regex",
"fileMatch": [
"^.kokoro/presubmit/graalvm-native.*.cfg$"
],
"matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?<currentValue>.*?)\""],
"depNameTemplate": "com.google.cloud:native-image-shared-config",
"datasourceTemplate": "maven"
}
],
"packageRules": [
{
"packagePatterns": [
Expand Down
Loading