rm: end of support adoptopenjdk

sksat · Dec 1, 2021 · 0142e59 · 0142e59
1 parent 56be0ec
commit 0142e59
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 55 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -57,7 +57,7 @@ jobs:
         if: steps.cache-paperclip.outputs.cache-hit != 'true'
         uses: actions/[email protected]
         with:
-          distribution: 'adopt-openj9'
+          distribution: 'temurin'
           java-version: '16.0.2'
           cache: 'gradle'
 
@@ -239,7 +239,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: ["openjdk", "adopt"]
+        jdk: ["openjdk", "eclipse-temurin"]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/utils/java.sh b/utils/java.sh
@@ -10,21 +10,6 @@ OPENJDK=(
   #"openjdk:16-oraclelinux8 arm64/v8 sha256:af04c50184d0227ece48c85e5535d622a9f4ed649d5f18e0f18f58c006b934c8"
 )
 
-# Non-Official AdoptOpenJDK images(but AdoptOpenJDK maintained)
-ADOPT_NONOFFICIAL=(
-  "adoptopenjdk/openjdk16:alpine amd64      sha256:bfbd644a7134a25c9033c8bd7b8122679df1f1e0ba3b3efa11e7ca54a268f0ab"
-  "adoptopenjdk/openjdk16:alpine-slim amd64 sha256:6760b8cd7d363f33df4a9ca026b1ae5696dd08327c2dee7165daa9e45c370c9b"
-  "adoptopenjdk/openjdk16:alpine-jre amd64  sha256:d027a32f10fb5e53f2c6f9b259e34641a2745a5e57af609e6cc0f606c0fb1e4a"
-  #"adoptopenjdk/openjdk16:aarch64-debianslim-jre-16.0.1_9 aarch64"
-  #"adoptopenjdk/openjdk16:armv7l-debianslim-jre-16.0.1_9 arm/v7"
-)
-# Non-Official AdoptOpenJDK OpenJ9 images(but AdoptOpenJDK maintained)
-ADOPT_NONOFFICIAL_OPENJ9=(
-  "adoptopenjdk/openjdk16-openj9:alpine amd64      sha256:7da4de3b8bc632c16ed5b4b533943a34438ac23260ae71770035ce3ba88de3e2"
-  "adoptopenjdk/openjdk16-openj9:alpine-slim amd64 sha256:e99a6f03c3f418eb34b982fbb5294549ff6c2981bded54eab053cf9f5431c2b6"
-  "adoptopenjdk/openjdk16-openj9:alpine-jre amd64  sha256:34b080fc64a346f7e4d8b7985dcac88400f3c07d2e4ff3d57d6fa0e117a92657"
-)
-
 # Eclipse temurin
 TEMURIN=(
   "eclipse-temurin:16.0.2_7-jdk amd64          sha256:23fddb8dfe8ab6d4c8f5b2cb8002cf441eb2fed8510df3972751180b31be2ab0"
@@ -44,33 +29,6 @@ function openjdk_imgs(){
 	done
 }
 
-function adopt_imgs(){
-	for adopt in "${ADOPT_NONOFFICIAL[@]}"; do
-		a=(${adopt[@]})
-		img="${a[0]}"
-		arch="${a[1]}"
-
-		tag=$(cut -d':' -f 2 <<<${img})
-
-		#echo "img: $img"
-		#echo "tag: $tag"
-		#echo "arch: $arch"
-
-		echo "\"$img\""
-	done
-}
-
-function adopt_openj9_imgs(){
-	for adopt in "${ADOPT_NONOFFICIAL_OPENJ9[@]}"; do
-		a=(${adopt[@]})
-		img="${a[0]}"
-		arch="${a[1]}"
-
-		tag=$(cut -d':' -f 2 <<<${img})
-		echo "\"$img\""
-	done
-}
-
 function temurin_imgs(){
 	for temurin in "${TEMURIN[@]}"; do
 		t=(${temurin[@]})
@@ -84,20 +42,14 @@ function temurin_imgs(){
 
 if [[ $1 == 'jdk-list' ]]; then
 	# JDK matrix for build jar
-	echo "::set-output JDK_MATRIX=openjdk,adopt"
+	echo "::set-output JDK_MATRIX=openjdk,temurin"
 elif [[ $1 == 'base-img' ]]; then
 	if [ $# -eq 1 ]; then
 		openjdk_imgs
-		adopt_imgs
-		adopt_openj9_imgs
 		temurin_imgs
 	fi
 
-	if [[ $2 == 'adopt' ]]; then
-		adopt_imgs
-	elif [[ $2 == 'adopt-openj9' ]]; then
-		adopt_openj9_imgs
-	elif [[ $2 == 'temurin' ]]; then
+	if [[ $2 == 'temurin' ]]; then
 		temurin_imgs
 	elif [[ $2 == 'openjdk' ]]; then
 		openjdk_imgs

diff --git a/utils/set-tags.sh b/utils/set-tags.sh
@@ -6,10 +6,10 @@ source ../.env
 DEFAULT_BRANCH='main'
 DEFAULT_JDK='adopt'
 
-if [[ "$JDK" == 'adopt' ]]; then
-	DEFAULT_BASE_IMG='alpine-jre'
-elif [[ "$JDK" == 'openjdk' ]]; then
+if [[ "$JDK" == 'openjdk' ]]; then
 	DEFAULT_BASE_IMG='16-slim'  # そうか？
+elif [[ "$JDK" == 'temurin' ]]; then
+	DEFAULT_BASE_IMG='16.0.2_7-jdk'
 fi
 
 #JDK=openjdk