Skip to content

Commit

Permalink
Merge pull request #4 from ajschmidt8/update-variables
Browse files Browse the repository at this point in the history
Update variable names
  • Loading branch information
ajschmidt8 authored Sep 9, 2022
2 parents 11a4075 + b2d3a91 commit a540ed4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions tools/rapids-package-name
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ set -eo pipefail

echo_prefix=" [rapids-package-name] "

if [[ ! -v GITHUB_REPOSITORY ]]; then
rapids-echo-stderr "${echo_prefix}Env var GITHUB_REPOSITORY must be set"
if [[ ! -v RAPIDS_REPOSITORY ]]; then
rapids-echo-stderr "${echo_prefix}Env var RAPIDS_REPOSITORY must be set"
exit 1
fi
repo_name="${GITHUB_REPOSITORY##*/}"
repo_name="${RAPIDS_REPOSITORY##*/}"

if [ -z "$1" ]; then
rapids-echo-stderr "${echo_prefix}Must specify input arguments: PKG_TYPE"
Expand Down
16 changes: 8 additions & 8 deletions tools/rapids-s3-path
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ if [[ ! -v RAPIDS_BUILD_TYPE ]]; then
exit 1
fi

if [[ ! -v GITHUB_SHA ]]; then
rapids-echo-stderr "${echo_prefix}Env var GITHUB_SHA must be set"
if [[ ! -v RAPIDS_SHA ]]; then
rapids-echo-stderr "${echo_prefix}Env var RAPIDS_SHA must be set"
exit 1
fi

if [[ ! -v GITHUB_REPOSITORY ]]; then
rapids-echo-stderr "${echo_prefix}Env var GITHUB_REPOSITORY must be set"
if [[ ! -v RAPIDS_REPOSITORY ]]; then
rapids-echo-stderr "${echo_prefix}Env var RAPIDS_REPOSITORY must be set"
exit 1
fi

repo_name="${GITHUB_REPOSITORY##*/}"
repo_name="${RAPIDS_REPOSITORY##*/}"

s3_directory_id=""
s3_prefix=""
Expand All @@ -44,11 +44,11 @@ case "${RAPIDS_BUILD_TYPE}" in
# more info:
# CopyPRs plugin in ops-bot: https://github.com/rapidsai/ops-bot#plugins
# https://circleci.com/blog/triggering-trusted-ci-jobs-on-untrusted-forks/
s3_directory_id="${GITHUB_REF_NAME##*/}"
s3_directory_id="${RAPIDS_REF_NAME##*/}"
s3_prefix="ci"
;;
branch)
s3_directory_id="${GITHUB_REF_NAME}"
s3_directory_id="${RAPIDS_REF_NAME}"
s3_prefix="ci"
;;
nightly)
Expand All @@ -61,7 +61,7 @@ case "${RAPIDS_BUILD_TYPE}" in
;;
esac

short_hash=${GITHUB_SHA:0:7}
short_hash=${RAPIDS_SHA:0:7}

s3_path="s3://rapids-downloads/${s3_prefix}/${repo_name}/"
if [[ "${RAPIDS_BUILD_TYPE}" != "nightly" ]]; then
Expand Down

0 comments on commit a540ed4

Please sign in to comment.