apache/kyuubi
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

[KYUUBI #6606][FOLLOWUP] Restore shell compatibility for build/mvn

Browse Source 
# 🔍 Description

I found the [previous change](https://github.com/apache/kyuubi/pull/6606) breaks compatibility in some shell interpreters, for example `[ ! -f "$MVN_BIN" ]`, `[ $MVN_DETECTED_VERSION != $MVN_VERSION ]` are not supported in ubuntu dash, which fails the CI https://github.com/apache/kyuubi/actions/runs/10347069575/job/28636666290

## Types of changes 🔖

- [x] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Test Plan 🧪

This change should recover the CI.

---

# Checklist 📝

- [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html)

**Be nice. Be informative.**

Closes #6610 from pan3793/mvn-followup.

Closes #6606

5381b60ac [Cheng Pan] 1

Authored-by: Cheng Pan <chengpan@apache.org>
Signed-off-by: Cheng Pan <chengpan@apache.org>
This commit is contained in:
Cheng Pan 2024-08-14 17:24:36 +08:00
parent d2c4fe397e
commit 5970af508c
No known key found for this signature in database
GPG Key ID: 8001952629BCC75D
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/master.yml vendored
View File

@ -418,7 +418,7 @@ jobs:
# passthrough CI into build container # passthrough CI into build container
build-args: | build-args: |
CI=${CI} CI=${CI}
MVN_ARG=--flink-provided --hive-provided -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -DskipTests MVN_ARG=--flink-provided --hive-provided
context: . context: .
file: build/Dockerfile.CI file: build/Dockerfile.CI
load: true load: true

52
build/mvn
View File

@ -61,38 +61,42 @@ install_app() {
rm -rf "$local_tarball" rm -rf "$local_tarball"
} }
# See simple version normalization: http://stackoverflow.com/questions/16989598/bash-comparing-version-numbers
function version { echo "$@" | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }'; }
# Determine the Maven version from the root pom.xml file and # Determine the Maven version from the root pom.xml file and
# install maven under the build/ folder if needed. # install maven under the build/ folder if needed.
install_mvn() { install_mvn() {
local MVN_VERSION=`grep "<maven.version>" "${_DIR}/../pom.xml" | head -n1 | awk -F '[<>]' '{print $3}'` local MVN_VERSION=`grep "<maven.version>" "${_DIR}/../pom.xml" | head -n1 | awk -F '[<>]' '{print $3}'`
MVN_BIN="${_DIR}/apache-maven-${MVN_VERSION}/bin/mvn" MVN_BIN="${_DIR}/apache-maven-${MVN_VERSION}/bin/mvn"
if [ ! -f "$MVN_BIN" ]; then if [ -f "$MVN_BIN" ]; then
MVN_BIN="$(command -v mvn)" return
if [ "$MVN_BIN" ]; then fi
local MVN_DETECTED_VERSION="$(mvn --version | head -n1 | awk '{print $3}')" MVN_BIN="$(command -v mvn)"
fi if [ "$MVN_BIN" ]; then
if [ $MVN_DETECTED_VERSION != $MVN_VERSION ]; then local MVN_DETECTED_VERSION="$(mvn --version | head -n1 | awk '{print $3}')"
local APACHE_MIRROR=${APACHE_MIRROR:-'https://www.apache.org/dyn/closer.lua'} fi
local MIRROR_URL_QUERY="?action=download" if [ $(version $MVN_DETECTED_VERSION) -ne $(version $MVN_VERSION) ]; then
local MVN_TARBALL="apache-maven-${MVN_VERSION}-bin.tar.gz" local APACHE_MIRROR=${APACHE_MIRROR:-'https://www.apache.org/dyn/closer.lua'}
local FILE_PATH="maven/maven-3/${MVN_VERSION}/binaries" local MIRROR_URL_QUERY="?action=download"
local MVN_TARBALL="apache-maven-${MVN_VERSION}-bin.tar.gz"
local FILE_PATH="maven/maven-3/${MVN_VERSION}/binaries"
if [ $(command -v curl) ]; then if [ $(command -v curl) ]; then
if ! curl -L --output /dev/null --silent --head --fail "${APACHE_MIRROR}/${FILE_PATH}/${MVN_TARBALL}${MIRROR_URL_QUERY}" ; then if ! curl -L --output /dev/null --silent --head --fail "${APACHE_MIRROR}/${FILE_PATH}/${MVN_TARBALL}${MIRROR_URL_QUERY}" ; then
# Fall back to archive.apache.org for older Maven # Fall back to archive.apache.org for older Maven
echo "Falling back to archive.apache.org to download Maven" echo "Falling back to archive.apache.org to download Maven"
APACHE_MIRROR="https://archive.apache.org/dist" APACHE_MIRROR="https://archive.apache.org/dist"
MIRROR_URL_QUERY="" MIRROR_URL_QUERY=""
fi
fi fi
install_app \
"${APACHE_MIRROR}/${FILE_PATH}" \
"${MVN_TARBALL}" \
"${MIRROR_URL_QUERY}"
MVN_BIN="${_DIR}/apache-maven-${MVN_VERSION}/bin/mvn"
fi fi
install_app \
"${APACHE_MIRROR}/${FILE_PATH}" \
"${MVN_TARBALL}" \
"${MIRROR_URL_QUERY}"
MVN_BIN="${_DIR}/apache-maven-${MVN_VERSION}/bin/mvn"
fi fi
} }