Skip to content

Commit e83cf89

Browse files
committed
[fix](ci) Fix BE UT macOS workflow for ARM64 runner
The macos-15 runner uses ARM64 (Apple Silicon), but the workflow was configured for x86_64, causing JDK version detection to fail with 'ERROR: The JAVA version is 25, it must be JDK-17'. Changes: - Use JAVA_HOME_17_ARM64 instead of JAVA_HOME_17_X64 - Download darwin-arm64 thirdparty prebuilt instead of darwin-x86_64 - Install openjdk@17 instead of openjdk@11 via brew
1 parent 6a38371 commit e83cf89

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/be-ut-mac.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
'gettext'
7878
'wget'
7979
'pcre'
80-
'openjdk@11'
80+
'openjdk@17'
8181
'maven'
8282
'node'
8383
'llvm@16'
@@ -87,14 +87,14 @@ jobs:
8787
pushd thirdparty
8888
branch="${{ github.base_ref }}"
8989
if [[ -z "${branch}" ]] || [[ "${branch}" == 'master' ]]; then
90-
curl -L https://github.com/apache/doris-thirdparty/releases/download/automation/doris-thirdparty-prebuilt-darwin-x86_64.tar.xz \
91-
-o doris-thirdparty-prebuilt-darwin-x86_64.tar.xz
90+
curl -L https://github.com/apache/doris-thirdparty/releases/download/automation/doris-thirdparty-prebuilt-darwin-arm64.tar.xz \
91+
-o doris-thirdparty-prebuilt-darwin-arm64.tar.xz
9292
else
93-
curl -L "https://github.com/apache/doris-thirdparty/releases/download/automation-${branch/branch-/}/doris-thirdparty-prebuilt-darwin-x86_64.tar.xz" \
94-
-o doris-thirdparty-prebuilt-darwin-x86_64.tar.xz
93+
curl -L "https://github.com/apache/doris-thirdparty/releases/download/automation-${branch/branch-/}/doris-thirdparty-prebuilt-darwin-arm64.tar.xz" \
94+
-o doris-thirdparty-prebuilt-darwin-arm64.tar.xz
9595
fi
96-
tar -xvf doris-thirdparty-prebuilt-darwin-x86_64.tar.xz
96+
tar -xvf doris-thirdparty-prebuilt-darwin-arm64.tar.xz
9797
popd
9898
99-
export JAVA_HOME="${JAVA_HOME_17_X64%\/}"
99+
export JAVA_HOME="${JAVA_HOME_17_ARM64%\/}"
100100
./run-be-ut.sh --run -j "$(nproc)" --clean

0 commit comments

Comments
 (0)