feat(agents): remove legacy Oracle Java agents
This commit is contained in:
t8y2 committed
1 parent
7486d35a0f
commit
6c232899b4
24 files changed
+66
-2012
No files matched your search
@@ -61,20 +61,16 @@ jobs:
|
||||
echo "Skipping automatic module version bump for migrated first release; versions.json was carried over from dbx-agents."
|
||||
else
|
||||
for dir in $(echo "$VERSIONS" | python3 -c "import sys,json; [print(k) for k in json.load(sys.stdin)]"); do
|
||||
if [ -d "agents/drivers/$dir" ] || [ -d "agents/$dir" ] || [ "$dir" = "common" ]; then
|
||||
if [ -d "agents/drivers/$dir" ]; then
|
||||
CHECK_DIR="drivers/$dir"
|
||||
else
|
||||
CHECK_DIR="$dir"
|
||||
fi
|
||||
EXTRA_CHECK_DIR=""
|
||||
if [ "$dir" = "oracle" ]; then
|
||||
EXTRA_CHECK_DIR="drivers/oracle-go"
|
||||
fi
|
||||
DIFF_PATHS=("agents/$CHECK_DIR/")
|
||||
if [ -n "$EXTRA_CHECK_DIR" ]; then
|
||||
DIFF_PATHS+=("agents/$EXTRA_CHECK_DIR/")
|
||||
fi
|
||||
if [ "$dir" = "oracle" ] && [ -d "agents/drivers/oracle-go" ]; then
|
||||
CHECK_DIR="drivers/oracle-go"
|
||||
elif [ -d "agents/drivers/$dir" ]; then
|
||||
CHECK_DIR="drivers/$dir"
|
||||
elif [ -d "agents/$dir" ] || [ "$dir" = "common" ]; then
|
||||
CHECK_DIR="$dir"
|
||||
else
|
||||
continue
|
||||
fi
|
||||
DIFF_PATHS=("agents/$CHECK_DIR/")
|
||||
# common changes affect all modules
|
||||
if git diff --quiet "$PREV_TAG"..HEAD -- agents/common/ 2>/dev/null; then
|
||||
COMMON_CHANGED=false
|
||||
@@ -99,7 +95,6 @@ jobs:
|
||||
CHANGED=true
|
||||
echo " $dir: $OLD_VER -> $NEW_VER"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
@@ -290,50 +285,8 @@ jobs:
|
||||
name: jre-${{ matrix.jre-key }}
|
||||
path: "dbx-jre-*.tar.gz"
|
||||
|
||||
build-jre8:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Download Adoptium JRE 8 for all platforms
|
||||
shell: bash
|
||||
run: |
|
||||
ADOPTIUM="https://api.adoptium.net/v3/binary/latest/8/ga"
|
||||
declare -A PLATFORMS=(
|
||||
["linux-x64"]="linux/x64"
|
||||
["linux-aarch64"]="linux/aarch64"
|
||||
["macos-x64"]="mac/x64"
|
||||
["windows-x64"]="windows/x64"
|
||||
)
|
||||
for platform in "${!PLATFORMS[@]}"; do
|
||||
os_arch="${PLATFORMS[$platform]}"
|
||||
echo "=== Downloading JRE 8 for $platform ($os_arch) ==="
|
||||
if [[ "$platform" == windows-* ]]; then
|
||||
curl -L -f -o jre8-$platform.zip "$ADOPTIUM/$os_arch/jre/hotspot/normal/eclipse?project=jdk"
|
||||
mkdir -p jre8-extract
|
||||
unzip -q jre8-$platform.zip -d jre8-extract
|
||||
mv jre8-extract/*/ dbx-jre || mv jre8-extract/* dbx-jre
|
||||
rm -rf jre8-extract jre8-$platform.zip
|
||||
else
|
||||
curl -L -f -o jre8-$platform.tar.gz "$ADOPTIUM/$os_arch/jre/hotspot/normal/eclipse?project=jdk"
|
||||
mkdir -p dbx-jre
|
||||
tar xzf jre8-$platform.tar.gz -C dbx-jre --strip-components=1
|
||||
rm -f jre8-$platform.tar.gz
|
||||
fi
|
||||
tar czf dbx-jre-8-$platform.tar.gz dbx-jre
|
||||
rm -rf dbx-jre
|
||||
done
|
||||
|
||||
if [ -f dbx-jre-8-macos-x64.tar.gz ]; then
|
||||
cp dbx-jre-8-macos-x64.tar.gz dbx-jre-8-macos-aarch64.tar.gz
|
||||
fi
|
||||
|
||||
ls -lh dbx-jre-8-*.tar.gz
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: jre-8
|
||||
path: "dbx-jre-8-*.tar.gz"
|
||||
|
||||
release:
|
||||
needs: [bump-versions, build-agents, build-oracle-native, build-xugu-native, build-jre, build-jre8]
|
||||
needs: [bump-versions, build-agents, build-oracle-native, build-xugu-native, build-jre]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
@@ -445,13 +398,11 @@ jobs:
|
||||
detect_jre_key() {
|
||||
local name="$1"
|
||||
case "$name" in
|
||||
oracle-10g) echo "8" ;;
|
||||
*) echo "21" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
JRE21_PLATFORMS=$(generate_jre_platforms "21")
|
||||
JRE8_PLATFORMS=$(generate_jre_platforms "8")
|
||||
|
||||
DRIVERS=""
|
||||
for f in release/dbx-agent-*.jar; do
|
||||
@@ -466,7 +417,7 @@ jobs:
|
||||
[ -n "$DRIVERS" ] && DRIVERS="${DRIVERS},"$'\n'
|
||||
DRIVERS="${DRIVERS}$(generate_jar_entry "$name" "$label" "$f" "$jre_key" "$version" "$external_driver" "$native_json")"
|
||||
done
|
||||
for name in xugu; do
|
||||
for name in oracle xugu; do
|
||||
[ -f "release/dbx-agent-${name}.jar" ] && continue
|
||||
native_json=$(generate_native_platforms "$name")
|
||||
[ -z "$native_json" ] && continue
|
||||
@@ -485,12 +436,6 @@ jobs:
|
||||
"platforms": {
|
||||
${JRE21_PLATFORMS}
|
||||
}
|
||||
},
|
||||
"8": {
|
||||
"version": "8u442",
|
||||
"platforms": {
|
||||
${JRE8_PLATFORMS}
|
||||
}
|
||||
}
|
||||
},
|
||||
"drivers": {
|
||||
@@ -517,7 +462,7 @@ jobs:
|
||||
for f in release/dbx-agent-*.jar; do
|
||||
DRIVER_NAMES+=("$(basename "$f" .jar | sed 's/dbx-agent-//')")
|
||||
done
|
||||
for name in xugu; do
|
||||
for name in oracle xugu; do
|
||||
[ -f "release/dbx-agent-${name}.jar" ] && continue
|
||||
compgen -G "release/dbx-agent-${name}-*" > /dev/null && DRIVER_NAMES+=("$name")
|
||||
done
|
||||
@@ -525,6 +470,7 @@ jobs:
|
||||
native_only_label() {
|
||||
local name="$1"
|
||||
case "$name" in
|
||||
oracle) echo "Oracle" ;;
|
||||
xugu) echo "虚谷 XuguDB" ;;
|
||||
*) echo "$name" ;;
|
||||
esac
|
||||
@@ -544,15 +490,14 @@ jobs:
|
||||
fi
|
||||
|
||||
NOTES="${NOTES}### ${label} (${old_ver} → ${new_ver})"$'\n'
|
||||
if [ -d "agents/drivers/$name" ]; then
|
||||
if [ "$name" = "oracle" ]; then
|
||||
LOG_PATH="agents/drivers/oracle-go/"
|
||||
elif [ -d "agents/drivers/$name" ]; then
|
||||
LOG_PATH="agents/drivers/$name/"
|
||||
else
|
||||
LOG_PATH="agents/$name/"
|
||||
fi
|
||||
LOG_PATHS=("$LOG_PATH")
|
||||
if [ "$name" = "oracle" ]; then
|
||||
LOG_PATHS+=("agents/drivers/oracle-go/")
|
||||
fi
|
||||
while IFS= read -r line; do
|
||||
[ -n "$line" ] && NOTES="${NOTES}- ${line}"$'\n'
|
||||
done < <(git log --oneline "$PREV_TAG"..HEAD -- "${LOG_PATHS[@]}" | sed 's/^[0-9a-f]* //')
|
||||
|
||||
Reference in new issue
Block a user