Skip to content

Commit

Permalink
include risedev change
Browse files Browse the repository at this point in the history
  • Loading branch information
wenym1 committed Mar 9, 2023
1 parent f2e3491 commit 7f18732
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
13 changes: 10 additions & 3 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -599,11 +599,18 @@ else
fi
ARTIFACT="risingwave-connector-1.0.0.tar.gz"
TARGET_PATH="${JAVA_DIR}/connector-node/assembly/target/${ARTIFACT}"
cd "${JAVA_DIR}"
"${MAVEN_PATH}" --batch-mode --update-snapshots clean package -Dmaven.test.skip
if [[ ! -f ${TARGET_PATH} ]] || [[ ! -z ${REBUILD_CONNECTOR_NODE} ]]; then
echo "Rebuild connector node"
cd "${JAVA_DIR}"
"${MAVEN_PATH}" --batch-mode --update-snapshots clean package -Dmaven.test.skip
else
echo "Connector node was built already. Skipped. Set REBUILD_CONNECTOR_NODE=1 to enable rebuild"
fi
rm -rf ${PREFIX_BIN}/connector-node
mkdir -p "${PREFIX_BIN}/connector-node"
tar xf "${JAVA_DIR}/connector-node/assembly/target/${ARTIFACT}" -C "${PREFIX_BIN}/connector-node"
tar xf ${TARGET_PATH} -C "${PREFIX_BIN}/connector-node"
'''


Expand Down
4 changes: 2 additions & 2 deletions src/risedevtool/connector.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ description = "Download Maven"
script = '''
#!/usr/bin/env bash
if !(command -v javac &> /dev/null && [[ "$(javac -version 2>&1 | awk '{print $2}')" =~ "11" ]]); then
echo "JDK 11 is not installed. Please install JDK 11 first."
if !(command -v javac &> /dev/null && [[ "$(javac -version 2>&1 | awk '{print $2}')" =~ ^(11|17) ]]); then
echo "JDK 11+ is not installed. Please install JDK 11+ first."
exit 1
fi
Expand Down

0 comments on commit 7f18732

Please sign in to comment.