Skip to content

Commit f5fcd37

Browse files
committed
support Corretto in install jdk script
1 parent 245da1f commit f5fcd37

File tree

2 files changed

+38
-20
lines changed

2 files changed

+38
-20
lines changed

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
container:
2525
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
2626
env:
27-
JAVA_HOME: "/usr/lib/jvm/openjdk-23"
27+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
2828
steps:
2929
- uses: actions/checkout@v4
3030
- name: Install Make
@@ -54,7 +54,7 @@ jobs:
5454
container:
5555
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
5656
env:
57-
JAVA_HOME: "/usr/lib/jvm/openjdk-23"
57+
JAVA_HOME: "/usr/lib/jvm/default-jdk"
5858
steps:
5959
- uses: actions/checkout@v4
6060
- name: Install Make

scripts/install_jdk.sh

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,48 @@
1414
##===----------------------------------------------------------------------===##
1515
set -euo pipefail
1616

17-
declare -r JDK_VERSION=23
18-
echo "Installing OpenJDK $JDK_VERSION..."
17+
declare -r JDK_VENDOR=Corretto
18+
echo "Installing $JDK_VENDOR JDK..."
1919

2020
apt-get update && apt-get install -y make curl libc6-dev
2121

2222
echo "Download JDK for: $(uname -m)"
2323

24-
if [ "$(uname -m)" = 'aarch64' ]; then
25-
curl https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-aarch64_bin.tar.gz --output jdk.tar.gz &&
26-
declare -r EXPECT_JDK_SHA=076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7;
27-
else
28-
curl https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz --output jdk.tar.gz &&
29-
declare -r EXPECT_JDK_SHA=08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67;
30-
fi
24+
if [ "$JDK_VENDOR" = 'OpenJDK' ]; then
25+
if [ "$(uname -m)" = 'aarch64' ]; then
26+
curl https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-aarch64_bin.tar.gz --output jdk.tar.gz &&
27+
declare -r EXPECT_JDK_SHA=076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7;
28+
else
29+
curl https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz --output jdk.tar.gz &&
30+
declare -r EXPECT_JDK_SHA=08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67;
31+
fi
32+
33+
declare -r JDK_SHA="$(sha256sum jdk.tar.gz | cut -d ' ' -f 1)"
34+
if [ "$JDK_SHA" != "$EXPECT_JDK_SHA" ]; then
35+
echo "Downloaded JDK SHA does not match expected!" &&
36+
exit 1;
37+
else
38+
echo "JDK SHA is correct.";
39+
fi
40+
elif [ "$JDK_VENDOR" = 'Corretto' ]; then
41+
if [ "$(uname -m)" = 'aarch64' ]; then
42+
curl https://corretto.aws/downloads/latest/amazon-corretto-22-aarch64-linux-jdk.tar.gz --output jdk.tar.gz &&
43+
declare -r EXPECT_JDK_MD5=1ebe5f5229bb18bc784a1e0f54d3fe39
44+
else
45+
curl https://corretto.aws/downloads/latest/amazon-corretto-22-x64-linux-jdk.tar.gz --output jdk.tar.gz &&
46+
declare -r EXPECT_JDK_MD5=5bd7fe30eb063699a3b4db7a00455841
47+
fi
3148

32-
declare -r JDK_SHA="$(sha256sum jdk.tar.gz | cut -d ' ' -f 1)"
33-
if [ "$JDK_SHA" != "$EXPECT_JDK_SHA" ]; then
34-
echo "Downloaded JDK SHA does not match expected!" &&
35-
exit 1;
36-
else
37-
echo "JDK SHA is correct.";
49+
declare -r JDK_MD5="$(md5sum jdk.tar.gz | cut -d ' ' -f 1)"
50+
if [ "$JDK_MD5" != "$EXPECT_JDK_MD5" ]; then
51+
echo "Downloaded JDK MD5 does not match expected!" &&
52+
exit 1;
53+
else
54+
echo "JDK MD5 is correct.";
55+
fi
3856
fi
3957

4058
# Extract and verify the JDK installation
41-
tar xzvf jdk.tar.gz && rm jdk.tar.gz && mkdir -p /usr/lib/jvm; mv jdk-23 /usr/lib/jvm/openjdk-23
42-
echo "JAVA_HOME = /usr/lib/jvm/openjdk-23"
43-
/usr/lib/jvm/openjdk-23/bin/java -version
59+
tar xzvf jdk.tar.gz && rm jdk.tar.gz && mkdir -p /usr/lib/jvm; mv jdk-23 /usr/lib/jvm/default-jdk
60+
echo "JAVA_HOME = /usr/lib/jvm/default-jdk"
61+
/usr/lib/jvm/default-jdk/bin/java -version

0 commit comments

Comments
 (0)