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(java17): Upgrade java runtime to JRE17 and compilation using JDK17, but target remains Java11 #2189

Merged
merged 1 commit into from
Oct 24, 2024
Merged

chore(java17): Upgrade java runtime to JRE17 and compilation using JDK17, but target remains Java11 #2189

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
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ jobs:
uses: docker/setup-buildx-action@v3
- uses: actions/setup-java@v4
with:
java-version: 11
java-version: |
17
11
distribution: 'zulu'
cache: 'gradle'
- name: Prepare build variables
Expand All @@ -36,7 +38,7 @@ jobs:
- name: Build
env:
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
- name: Build local slim container image for testing
uses: docker/build-push-action@v6
with:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ jobs:
uses: docker/setup-buildx-action@v3
- uses: actions/setup-java@v4
with:
java-version: 11
java-version: |
17
11
distribution: 'zulu'
cache: 'gradle'
- name: Prepare build variables
Expand All @@ -30,7 +32,7 @@ jobs:
- name: Build
env:
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
run: ./gradlew build ${{ steps.build_variables.outputs.REPO }}-web:installDist
run: ./gradlew -PenableCrossCompilerPlugin=true build ${{ steps.build_variables.outputs.REPO }}-web:installDist
- name: Build slim container image
uses: docker/build-push-action@v6
with:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ jobs:
uses: docker/setup-buildx-action@v3
- uses: actions/setup-java@v4
with:
java-version: 11
java-version: |
17
11
distribution: 'zulu'
cache: 'gradle'
- name: Assemble release info
Expand All @@ -50,14 +52,14 @@ jobs:
ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }}
ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }}
run: |
./gradlew --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
./gradlew -PenableCrossCompilerPlugin=true --info build ${{ steps.build_variables.outputs.REPO }}-web:installDist publishToNexus closeAndReleaseNexusStagingRepository
- name: Publish apt packages to Google Artifact Registry
env:
ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }}
ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true
GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }}
run: |
./gradlew --info publish
./gradlew -PenableCrossCompilerPlugin=true --info publish
- name: Login to GAR
# Only run this on repositories in the 'spinnaker' org, not on forks.
if: startsWith(github.repository, 'spinnaker/')
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.compile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:bionic
RUN apt-get update && apt-get install -y \
openjdk-11-jdk \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*
LABEL maintainer="[email protected]"
ENV GRADLE_USER_HOME /workspace/.gradle
Expand Down
7 changes: 2 additions & 5 deletions Dockerfile.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11
FROM python:3.7-alpine3.16
Copy link
Contributor

@dbyron-sf dbyron-sf Oct 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The changes here are the only diffs from #2171, which failed with:

#9 [linux/amd64 2/8] RUN apk --no-cache add --update       bash       curl       openjdk17-jre       openssl       py-pip       python   && pip install --upgrade awscli==1.18.18   && apk --purge del        py-pip   && rm -rf /var/cache/apk
#9 0.076 fetch http://dl-cdn.alpinelinux.org/alpine/v3.11/main/x86_64/APKINDEX.tar.gz
#9 0.274 fetch http://dl-cdn.alpinelinux.org/alpine/v3.11/community/x86_64/APKINDEX.tar.gz
#9 0.538 ERROR: unable to select packages:
#9 0.552   openjdk17-jre (no such package):
#9 0.552     required by: world[openjdk17-jre]
#9 ERROR: process "/bin/sh -c apk --no-cache add --update       bash       curl       openjdk17-jre       openssl       py-pip       python   && pip install --upgrade awscli==${AWS_CLI_VERSION}   && apk --purge del        py-pip   && rm -rf /var/cache/apk" did not complete successfully: exit code: 1

LABEL maintainer="[email protected]"
ARG TARGETARCH

Expand All @@ -9,13 +9,10 @@ ENV AWS_CLI_VERSION=1.18.18
RUN apk --no-cache add --update \
bash \
curl \
openjdk11-jre \
openjdk17-jre \
openssl \
py-pip \
python \
&& pip install --upgrade awscli==${AWS_CLI_VERSION} \
&& apk --purge del \
py-pip \
&& rm -rf /var/cache/apk

RUN echo '#!/usr/bin/env bash' > /usr/local/bin/hal && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV AWS_CLI_VERSION=1.18.18
RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y \
openjdk-11-jre-headless \
openjdk-17-jre-headless \
curl \
python-pip && \
rm -rf /var/lib/apt/lists/* && \
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fiatVersion=1.50.0
front50Version=2.35.0
org.gradle.parallel=true
spinnakerGradleVersion=8.32.1
targetJava11=true
targetJava17=false

# To enable a composite reference to a project, set the
# project property `'<projectName>Composite=true'`.
Expand Down