Skip to content

Commit

Permalink
Merge pull request rapidsai#1005 from dillon-cullinan/fix-ci-scripts
Browse files Browse the repository at this point in the history
[REVIEW] Update CI scripts to remove references to master [skip ci]
  • Loading branch information
mike-wendt committed Aug 20, 2020
2 parents 68fde60 + ab214a7 commit 1e23741
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# built from https://github.com/rapidsai/cudf/blob/master/Dockerfile
# built from https://github.com/rapidsai/cudf/blob/main/Dockerfile
FROM cudf

ADD src /cugraph/src
Expand Down
6 changes: 3 additions & 3 deletions ci/checks/changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# cuGraph CHANGELOG Tester #
############################

# Checkout master for comparison
git checkout --quiet master
# Checkout main for comparison
git checkout --quiet main

# Switch back to tip of PR branch
git checkout --quiet current-pr-branch
Expand All @@ -14,7 +14,7 @@ git checkout --quiet current-pr-branch
set +e

# Get list of modified files between matster and PR branch
CHANGELOG=`git diff --name-only master...current-pr-branch | grep CHANGELOG.md`
CHANGELOG=`git diff --name-only main...current-pr-branch | grep CHANGELOG.md`
# Check if CHANGELOG has PR ID
PRNUM=`cat CHANGELOG.md | grep "$PR_ID"`
RETVAL=0
Expand Down
4 changes: 1 addition & 3 deletions ci/cpu/cugraph/upload-anaconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ set -e
if [[ "$BUILD_CUGRAPH" == "1" && "$UPLOAD_CUGRAPH" == "1" ]]; then
export UPLOADFILE=`conda build conda/recipes/cugraph -c rapidsai -c nvidia -c numba -c conda-forge -c defaults --python=$PYTHON --output`

SOURCE_BRANCH=master

# Have to label all CUDA versions due to the compatibility to work with any CUDA
if [ "$LABEL_MAIN" == "1" ]; then
Expand All @@ -32,8 +31,7 @@ if [[ "$BUILD_CUGRAPH" == "1" && "$UPLOAD_CUGRAPH" == "1" ]]; then

test -e ${UPLOADFILE}

# Restrict uploads to master branch
if [ ${GIT_BRANCH} != ${SOURCE_BRANCH} ]; then
if [ ${BUILD_MODE} != "branch" ]; then
echo "Skipping upload"
return 0
fi
Expand Down
4 changes: 1 addition & 3 deletions ci/cpu/libcugraph/upload-anaconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@ if [[ "$BUILD_LIBCUGRAPH" == "1" && "$UPLOAD_LIBCUGRAPH" == "1" ]]; then

export UPLOADFILE=`conda build conda/recipes/libcugraph --output`

SOURCE_BRANCH=master

LABEL_OPTION="--label main"
echo "LABEL_OPTION=${LABEL_OPTION}"

test -e ${UPLOADFILE}

# Restrict uploads to master branch
if [ ${GIT_BRANCH} != ${SOURCE_BRANCH} ]; then
if [ ${BUILD_MODE} != "branch" ]; then
echo "Skipping upload"
return 0
fi
Expand Down
2 changes: 1 addition & 1 deletion conda_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ conda build -c nvidia -c rapidsai -c rapidsai-nightly/label/cuda${CUDA_REL} -c c

if [ "$UPLOAD_PACKAGE" == '1' ]; then
export UPLOADFILE=`conda build -c nvidia -c rapidsai -c conda-forge -c defaults --python=${PYTHON} conda/recipes/cugraph --output`
SOURCE_BRANCH=master
SOURCE_BRANCH=main

test -e ${UPLOADFILE}

Expand Down

0 comments on commit 1e23741

Please sign in to comment.