Skip to content

Commit

Permalink
Revert "Merge pull request rapidsai#4319 from AyodeAwe/branch-21.12" (r…
Browse files Browse the repository at this point in the history
…apidsai#4325)

This PR reverts the changes in rapidsai#4319, which seem to be causing some doc build timeouts.

These changes will require additional testing before being re-merged. (cc: @AyodeAwe).

Authors:
  - AJ Schmidt (https://github.com/ajschmidt8)

Approvers:
  - Dante Gama Dessavre (https://github.com/dantegd)
  - Jake Awe (https://github.com/AyodeAwe)

URL: rapidsai#4325
  • Loading branch information
ajschmidt8 authored Nov 2, 2021
1 parent d8b7932 commit 81a432f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion ci/docs/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ conda list --show-channel-urls
# Build Doxygen docs
gpuci_logger "Build Doxygen docs"
"$PROJECT_WORKSPACE/build.sh" cppdocs -v
wget "https://raw.githubusercontent.com/rapidsai/docs/gh-pages/api/librmm/${BRANCH_VERSION}/rmm.tag" || echo "Failed to download rmm Doxygen tag"

# Build Python docs
gpuci_logger "Build Sphinx docs"
Expand Down
5 changes: 1 addition & 4 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,4 @@ for FILE in conda/environments/*.yml; do
sed_runner "s/rapids-build-env=${CURRENT_SHORT_TAG}/rapids-build-env=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rapids-notebook-env=${CURRENT_SHORT_TAG}/rapids-notebook-env=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rapids-doc-env=${CURRENT_SHORT_TAG}/rapids-doc-env=${NEXT_SHORT_TAG}/g" ${FILE};
done

# Doxyfile update
sed_runner "s|\(TAGFILES.*librmm/\).*|\1${NEXT_SHORT_TAG}|" cpp/Doxyfile.in
done
2 changes: 1 addition & 1 deletion cpp/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -2062,7 +2062,7 @@ SKIP_FUNCTION_MACROS = YES
# the path). If a tag file is not located in the directory in which doxygen is
# run, you must also specify the path to the tagfile here.

TAGFILES = rmm.tag=https://docs.rapids.ai/api/librmm/21.12
TAGFILES =

# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
# tag file that is based on the input files it reads. See section "Linking to
Expand Down

0 comments on commit 81a432f

Please sign in to comment.