Skip to content

Commit

Permalink
Merge pull request #1067 from kkraus14/rapidsai_conda_channels
Browse files Browse the repository at this point in the history
[REVIEW] Upload conda packages to both blazingsql and rapidsai conda channels
  • Loading branch information
William Malpica authored Oct 12, 2020
2 parents 82e4e4d + 1de0428 commit 3d3b446
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- #998 Update TPCH queries, become implicit joins into implicit joins to avoid random values.
- #1055 Removing cudf source code dependency as some cudf utilities headers were exposed
- #1065 Remove thrift from build prodcess as its no longer used
- #1067 Upload conda packages to both rapidsai and blazingsql conda channels

## Bug Fixes
- #918 Activate validation for GPU_CI tests results.
Expand Down
20 changes: 16 additions & 4 deletions ci/cpu/upload_anaconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export BLAZINGSQL_FILE=`conda build conda/recipes/blazingsql/ --python=$PYTHON -

# Restrict uploads to master branch
if [ ${GIT_BRANCH} != ${SOURCE_BRANCH} ]; then
echo "Skipping upload"
return 0
echo "Skipping upload"
return 0
fi

if [ -z "$MY_UPLOAD_KEY" ]; then
Expand All @@ -20,11 +20,23 @@ fi
if [ "$UPLOAD_BLAZING" == "1" ]; then
LABEL_OPTION="--label main --label cuda"$CUDA
if [ ! -z "$CUSTOM_LABEL" ]; then
LABEL_OPTION="--label "$CUSTOM_LABEL
LABEL_OPTION="--label "$CUSTOM_LABEL
fi
echo "LABEL_OPTION=${LABEL_OPTION}"

if [ ${CONDA_USERNAME} == "blazingsql" ]; then
RAPIDS_CONDA_USERNAME="rapidsai"
RAPIDS_CONDA_KEY=${RAPIDS_UPLOAD_KEY}
elif [ ${CONDA_USERNAME} == "blazingsql-nightly" ]; then
RAPIDS_CONDA_USERNAME="rapidsai-nightly"
RAPIDS_CONDA_KEY=${RAPIDS_NIGHTLY_UPLOAD_KEY}
fi

test -e ${BLAZINGSQL_FILE}
echo "Upload BlazingSQL: "${BLAZINGSQL_FILE}

echo "Upload BlazingSQL to ${CONDA_USERNAME} channel: ${BLAZINGSQL_FILE}"
anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME} ${LABEL_OPTION} --force ${BLAZINGSQL_FILE}

echo "Upload BlazingSQL to ${RAPIDS_CONDA_USERNAME} channel: ${BLAZINGSQL_FILE}"
anaconda -t ${RAPIDS_CONDA_KEY} upload -u ${RAPIDS_CONDA_USERNAME} ${LABEL_OPTION} --force ${BLAZINGSQL_FILE}
fi

0 comments on commit 3d3b446

Please sign in to comment.