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

feat: update graal-sdk to 24 and graalvm-A to 21.x #815

Merged
merged 22 commits into from
Jul 30, 2024
Merged

feat: update graal-sdk to 24 and graalvm-A to 21.x #815

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c6ef2ea
feat: update graal-sdk to 24 and graalvm-A to 22.x
mpeddada1 Apr 24, 2024
8aedffe
temporarily comment out check for docker structure
mpeddada1 Apr 25, 2024
7c9076d
empty commit to re-run build
mpeddada1 Apr 25, 2024
6ec1da7
skip ITHttpAnnotation for now
mpeddada1 Apr 25, 2024
92dc370
ignore ITHttpAnnotation
mpeddada1 Apr 30, 2024
7272e9b
modify script with necessary helpers
mpeddada1 Apr 30, 2024
17576ac
add update_all_poms_dependency
mpeddada1 Apr 30, 2024
d1b9bcb
include missing helper
mpeddada1 Apr 30, 2024
1cb1485
fix structure test
mpeddada1 Apr 30, 2024
41bacd6
fix structure test with correct versions
mpeddada1 Apr 30, 2024
ffb8bb8
add comment with link to sdk-platform-java issue
mpeddada1 Apr 30, 2024
57085e9
Merge branch 'main' into udpate-graalvm-a
mpeddada1 Jul 2, 2024
aec67ef
remove test skip
mpeddada1 Jul 8, 2024
dd8ed58
Merge branch 'udpate-graalvm-a' of github.com:googleapis/java-shared-…
mpeddada1 Jul 8, 2024
761b7d6
consistent comments
mpeddada1 Jul 8, 2024
f9e22b9
rebase with main
mpeddada1 Jul 8, 2024
7bfa8f2
add ignoredDependencies for nativeimage dep
mpeddada1 Jul 29, 2024
a15ac9e
Merge branch 'main' into udpate-graalvm-a
mpeddada1 Jul 29, 2024
06ab608
double check with full list
mpeddada1 Jul 30, 2024
e05f891
Merge branch 'udpate-graalvm-a' of github.com:googleapis/java-shared-…
mpeddada1 Jul 30, 2024
0386a51
remove pluginManagement
mpeddada1 Jul 30, 2024
a40ea7c
use surefire 3.3.1
mpeddada1 Jul 30, 2024
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: 2 additions & 3 deletions .cloudbuild/graalvm-a.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ghcr.io/graalvm/graalvm-ce:ol7-java11-22.3.3-b1
FROM ghcr.io/graalvm/graalvm-community:21.0.2-ol7-20240116

RUN gu install native-image && \
yum update -y && \
RUN yum update -y && \
yum install -y wget unzip git && \
# Install maven
wget -q https://archive.apache.org/dist/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.zip -O /tmp/maven.zip && \
Expand Down
2 changes: 1 addition & 1 deletion .cloudbuild/graalvm-a.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ commandTests:
- name: "version"
command: ["java", "-version"]
# java -version outputs to stderr...
expectedError: ["openjdk version \"11.0.20\"", "GraalVM CE 22.3.3"]
expectedError: ["openjdk version \"21.0.2\"", "GraalVM CE 21.0.2"]
- name: "maven"
command: ["mvn", "-version"]
expectedOutput: ["Apache Maven 3.9.4"]
Expand Down
7 changes: 3 additions & 4 deletions .kokoro/presubmit/downstream-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
set -eo pipefail
set -x


function modify_shared_config() {
xmllint --shell pom.xml <<EOF
setns x=http://maven.apache.org/POM/4.0.0
Expand Down Expand Up @@ -54,17 +53,17 @@ pushd sdk-platform-java/showcase/gapic-showcase
SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)
popd

## Start showcase server
### Start showcase server
mkdir -p /usr/src/showcase
curl --location https://github.com/googleapis/gapic-showcase/releases/download/v"${SHOWCASE_VERSION}"/gapic-showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz --output /usr/src/showcase/showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz
pushd /usr/src/showcase/
tar -xf showcase-*
./gapic-showcase run &
popd

# Run showcase tests with `native` profile
# Run showcase tests with `native` profile. Skipping ITHttpAnnotation until https://github.com/googleapis/sdk-platform-java/issues/2695 is fixed.
pushd sdk-platform-java/showcase
mvn test -Pnative,-showcase -Denforcer.skip=true -ntp -B
mvn test -Dtest='!com.google.showcase.v1beta1.it.ITHttpAnnotation' -Dsurefire.failIfNoSpecifiedTests=false -Pnative,-showcase -Denforcer.skip=true -ntp -B
popd

exit $RETURN_CODE
2 changes: 1 addition & 1 deletion native-image-shared-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<properties>
<surefire.version>3.2.5</surefire.version>
<graal-sdk.version>22.3.5</graal-sdk.version>
<graal-sdk.version>24.0.1</graal-sdk.version>
</properties>

<dependencyManagement>
Expand Down
Loading