Remove legacy Adopt distributions

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Bruno Borges
2026-07-31 10:30:35 -04:00
parent 881f2634a1
commit 2fe5911e91
17 changed files with 51 additions and 2429 deletions
+17 -17
View File
@@ -34,7 +34,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '17'
cache: gradle
- name: Create files to cache
@@ -62,7 +62,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: gradle
cache-read-only: true
@@ -85,7 +85,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: maven
- name: Create files to cache
@@ -111,7 +111,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: maven
cache-read-only: true
@@ -138,7 +138,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: sbt
- name: Setup SBT
@@ -178,7 +178,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: sbt
cache-read-only: true
@@ -207,7 +207,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '17'
cache: gradle
cache-dependency-path: __tests__/cache/gradle1/*.gradle*
@@ -236,7 +236,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: gradle
cache-dependency-path: __tests__/cache/gradle1/*.gradle*
@@ -260,7 +260,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: gradle
cache-dependency-path: __tests__/cache/gradle2/*.gradle*
@@ -281,7 +281,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: maven
cache-dependency-path: __tests__/cache/maven/pom.xml
@@ -308,7 +308,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: maven
cache-dependency-path: __tests__/cache/maven/pom.xml
@@ -332,7 +332,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: maven
cache-dependency-path: |
@@ -359,7 +359,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: sbt
cache-dependency-path: __tests__/cache/sbt/*.sbt
@@ -400,7 +400,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: sbt
cache-dependency-path: __tests__/cache/sbt/*.sbt
@@ -434,7 +434,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: sbt
cache-dependency-path: __tests__/cache/sbt2/*.sbt
@@ -458,7 +458,7 @@ jobs:
- name: Run setup-java with a custom Maven cache path
uses: ./
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: maven
cache-dependency-path: |
@@ -483,7 +483,7 @@ jobs:
- name: Run setup-java with a custom Maven cache path
uses: ./
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: maven
cache-dependency-path: |
-41
View File
@@ -15,47 +15,6 @@ permissions:
contents: read
jobs:
setup-java-local-file-adopt:
name: Validate installation from local file Adopt
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
steps:
- name: Checkout
uses: actions/checkout@v7
with:
persist-credentials: false
- name: Download Adopt OpenJDK file
run: |
if ($IsLinux) {
$downloadUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz"
$localFilename = "java_package.tar.gz"
} elseif ($IsMacOS) {
$downloadUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz"
$localFilename = "java_package.tar.gz"
} elseif ($IsWindows) {
$downloadUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_windows_hotspot_11.0.10_9.zip"
$localFilename = "java_package.zip"
}
echo "LocalFilename=$localFilename" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
(New-Object System.Net.WebClient).DownloadFile($downloadUrl, "$env:RUNNER_TEMP/$localFilename")
shell: pwsh
- name: setup-java
uses: ./
id: setup-java
with:
distribution: 'jdkfile'
jdk-file: ${{ runner.temp }}/${{ env.LocalFilename }}
java-version: '11.0.0-ea'
architecture: x64
- name: Verify Java version
env:
JAVA_PATH: ${{ steps.setup-java.outputs.path }}
run: bash __tests__/verify-java.sh "11.0.10" "$JAVA_PATH"
shell: bash
setup-java-local-file-zulu:
name: Validate installation from local file Zulu
runs-on: ${{ matrix.os }}
+4 -4
View File
@@ -35,7 +35,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
server-id: maven
server-username-env-var: MAVEN_USERNAME
@@ -90,7 +90,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
server-id: maven
server-username-env-var: MAVEN_USERNAME
@@ -128,7 +128,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
server-id: maven
server-username-env-var: MAVEN_USERNAME
@@ -161,7 +161,7 @@ jobs:
uses: ./
id: setup-java
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
server-id: maven
server-username-env-var: MAVEN_USERNAME
+5 -9
View File
@@ -21,10 +21,9 @@ jobs:
fail-fast: false
matrix:
os: [macos-15-intel, windows-latest, ubuntu-latest]
distribution: [
distribution:
[
'temurin',
'adopt',
'adopt-openj9',
'zulu',
'liberica',
'microsoft',
@@ -35,7 +34,7 @@ jobs:
'jetbrains',
'kona',
'liberica-nik'
] # internally 'adopt-hotspot' is the same as 'adopt'
]
version: ['21', '11', '17']
exclude:
- distribution: microsoft
@@ -581,11 +580,8 @@ jobs:
fail-fast: false
matrix:
os: *default_os
distribution: ['adopt', 'adopt-openj9', 'zulu']
distribution: ['temurin', 'zulu']
java-version-file: ['.java-version', '.tool-versions']
exclude:
- os: macos-latest
distribution: adopt-openj9
steps:
- *checkout_step
- name: Create .java-version file
@@ -613,7 +609,7 @@ jobs:
fail-fast: false
matrix:
os: *default_os
distribution: ['adopt', 'zulu', 'liberica']
distribution: ['temurin', 'zulu', 'liberica']
java-version-file: ['.java-version', '.tool-versions', '.sdkmanrc']
steps:
- *checkout_step