From 72bac753a346bed258b4c7bedcb32a77e0a6b3e2 Mon Sep 17 00:00:00 2001
From: nvauto <70000568+nvauto@users.noreply.github.com>
Date: Thu, 13 Feb 2025 08:00:51 +0000
Subject: [PATCH 1/2] Update dependency version JNI, private, hybrid to 25.02.0
Wait for the pre-merge CI job to SUCCEED
Signed-off-by: nvauto <70000568+nvauto@users.noreply.github.com>
---
pom.xml | 6 +++---
scala2.13/pom.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8dc473682c1..f5a6cc1cc70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -840,9 +840,9 @@
spark${buildver}
cuda11
${cuda.version}
- 25.02.0-SNAPSHOT
- 25.02.0-SNAPSHOT
- 25.02.0-SNAPSHOT
+ 25.02.0
+ 25.02.0
+ 25.02.0
2.12
incremental
2.12.15
diff --git a/scala2.13/pom.xml b/scala2.13/pom.xml
index a6950611258..88e940eebfd 100644
--- a/scala2.13/pom.xml
+++ b/scala2.13/pom.xml
@@ -840,9 +840,9 @@
spark${buildver}
cuda11
${cuda.version}
- 25.02.0-SNAPSHOT
- 25.02.0-SNAPSHOT
- 25.02.0-SNAPSHOT
+ 25.02.0
+ 25.02.0
+ 25.02.0
2.13
incremental
2.13.14
From b889bdd9fe87cb3f1b4aa836c5dfb9ed6d965ce2 Mon Sep 17 00:00:00 2001
From: YanxuanLiu
Date: Mon, 17 Feb 2025 17:08:02 +0800
Subject: [PATCH 2/2] Update get-deps-sha1.sh to skip sha1 check for no
snapshot ver
---
.../mvn-verify-check/get-deps-sha1.sh | 23 +++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/mvn-verify-check/get-deps-sha1.sh b/.github/workflows/mvn-verify-check/get-deps-sha1.sh
index aa7129bd3ef..2e3a3746edd 100755
--- a/.github/workflows/mvn-verify-check/get-deps-sha1.sh
+++ b/.github/workflows/mvn-verify-check/get-deps-sha1.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2024, NVIDIA CORPORATION.
+# Copyright (c) 2024-2025, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -24,12 +24,21 @@ project_private="rapids-4-spark-private_${scala_ver}"
jni_ver=$(mvn help:evaluate -q -pl dist -Dexpression=spark-rapids-jni.version -DforceStdout)
private_ver=$(mvn help:evaluate -q -pl dist -Dexpression=spark-rapids-private.version -DforceStdout)
-jni_sha1=$(curl -s -H "Accept: application/json" \
- "${base_URL}?r=snapshots&g=com.nvidia&a=${project_jni}&v=${jni_ver}&c=&e=jar&wt=json" \
- | jq .data.sha1) || $(date +'%Y-%m-%d')
-private_sha1=$(curl -s -H "Accept: application/json" \
- "${base_URL}?r=snapshots&g=com.nvidia&a=${project_private}&v=${private_ver}&c=&e=jar&wt=json" \
- | jq .data.sha1) || $(date +'%Y-%m-%d')
+if [[ $jni_ver == *SNAPSHOT* ]]; then
+ jni_sha1=$(curl -s -H "Accept: application/json" \
+ "${base_URL}?r=snapshots&g=com.nvidia&a=${project_jni}&v=${jni_ver}&c=&e=jar&wt=json" \
+ | jq .data.sha1) || $(date +'%Y-%m-%d')
+else
+ jni_sha1=$jni_ver
+fi
+
+if [[ $private_ver == *SNAPSHOT* ]]; then
+ private_sha1=$(curl -s -H "Accept: application/json" \
+ "${base_URL}?r=snapshots&g=com.nvidia&a=${project_private}&v=${private_ver}&c=&e=jar&wt=json" \
+ | jq .data.sha1) || $(date +'%Y-%m-%d')
+else
+ private_sha1=$private_ver
+fi
sha1md5=$(echo -n "${jni_sha1}_${private_sha1}" | md5sum | awk '{print $1}')