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.

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

Consistenly switch from AdoptOpenJDK to Eclipse Temurin #5068

Merged
merged 1 commit into from
Feb 17, 2022
Merged
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
12 changes: 6 additions & 6 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Build all classes
@@ -34,7 +34,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Build the reporter-web-app
@@ -50,7 +50,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Run unit tests
@@ -80,7 +80,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Run functional tests
@@ -97,7 +97,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Run functional tests
@@ -113,7 +113,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Run functional tests
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
distribution: temurin
java-version: 11
cache: gradle
- name: Check for Detekt Issues
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ ARG CRT_FILES=""
# Set this to the ScanCode version to use.
ARG SCANCODE_VERSION="30.1.0"

FROM adoptopenjdk:11-jdk-hotspot-focal AS build
FROM eclipse-temurin:11-jdk-focal AS build

COPY . /usr/local/src/ort

@@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/tmp/.gradle/ \
sed -i -r '/distributionSha256Sum=[0-9a-f]{64}/d' gradle/wrapper/gradle-wrapper.properties && \
./gradlew --no-daemon --stacktrace -Pversion=$ORT_VERSION :cli:distTar :helper-cli:startScripts

FROM adoptopenjdk:11-jdk-hotspot-focal AS run
FROM eclipse-temurin:11-jdk-focal AS run

ENV \
# Package manager versions.
2 changes: 1 addition & 1 deletion batect.yml
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ config_variables:

containers:
build:
image: adoptopenjdk:11-jdk-hotspot-focal
image: eclipse-temurin:11-jdk-focal
<<: *common-container-config
run:
build_directory: <{batect.project_directory}