Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency version JNI, private, hybrid to 25.02.0 [skip ci] #12129

Merged
merged 2 commits into from
Feb 17, 2025
+22 −13
Merged

Update dependency version JNI, private, hybrid to 25.02.0 [skip ci] #12129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72bac75
Update dependency version JNI, private, hybrid to 25.02.0
nvauto Feb 13, 2025
b889bdd
Update get-deps-sha1.sh to skip sha1 check for no snapshot ver
YanxuanLiu Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions .github/workflows/mvn-verify-check/get-deps-sha1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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}')

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,9 +840,9 @@
<spark.version.classifier>spark${buildver}</spark.version.classifier>
<cuda.version>cuda11</cuda.version>
<jni.classifier>${cuda.version}</jni.classifier>
<spark-rapids-jni.version>25.02.0-SNAPSHOT</spark-rapids-jni.version>
<spark-rapids-private.version>25.02.0-SNAPSHOT</spark-rapids-private.version>
<spark-rapids-hybrid.version>25.02.0-SNAPSHOT</spark-rapids-hybrid.version>
<spark-rapids-jni.version>25.02.0</spark-rapids-jni.version>
<spark-rapids-private.version>25.02.0</spark-rapids-private.version>
<spark-rapids-hybrid.version>25.02.0</spark-rapids-hybrid.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.recompileMode>incremental</scala.recompileMode>
<scala.version>2.12.15</scala.version>
Expand Down
6 changes: 3 additions & 3 deletions scala2.13/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,9 +840,9 @@
<spark.version.classifier>spark${buildver}</spark.version.classifier>
<cuda.version>cuda11</cuda.version>
<jni.classifier>${cuda.version}</jni.classifier>
<spark-rapids-jni.version>25.02.0-SNAPSHOT</spark-rapids-jni.version>
<spark-rapids-private.version>25.02.0-SNAPSHOT</spark-rapids-private.version>
<spark-rapids-hybrid.version>25.02.0-SNAPSHOT</spark-rapids-hybrid.version>
<spark-rapids-jni.version>25.02.0</spark-rapids-jni.version>
<spark-rapids-private.version>25.02.0</spark-rapids-private.version>
<spark-rapids-hybrid.version>25.02.0</spark-rapids-hybrid.version>
<scala.binary.version>2.13</scala.binary.version>
<scala.recompileMode>incremental</scala.recompileMode>
<scala.version>2.13.14</scala.version>
Expand Down
Loading