Skip to content

Commit 68528ba

Browse files
committed
Update Circle steps for building docs
1 parent ad1525e commit 68528ba

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

.circleci/config.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,13 @@ jobs:
316316
name: Install deps
317317
command: |
318318
pip install --no-cache-dir -r docs/requirements.txt
319-
pip install --no-cache-dir "setuptools ~= 42.0" "setuptools_scm[toml] >= 3.4"
320-
python setup.py --version
319+
pip install --no-cache-dir "setuptools_scm[toml]"
320+
python -m setuptools_scm
321321
- run:
322322
name: Build only this commit
323-
command: make -C docs SPHINXOPTS="-W" BUILDDIR="_build/no_version_html" html
323+
command: make -C docs SPHINXOPTS="-W" BUILDDIR="$HOME/docs" OUTDIR=no_version_html html
324324
- store_artifacts:
325-
path: ./docs/_build/no_version_html/html
325+
path: /home/circleci/docs/no_version_html
326326
destination: noversion
327327
- run:
328328
name: Stop or generate versioned docs?
@@ -347,7 +347,9 @@ jobs:
347347
- ./docs/_build
348348
- run:
349349
name: Generate Versioned Docs
350-
command: make -f ./docs/Makefile versioned CURBRANCH=${CIRCLE_TAG:-$CIRCLE_BRANCH}
350+
command: |
351+
BRANCH=$( echo $CIRCLE_BRANCH | sed 's+/+_+g' )
352+
make -C docs SPHINXOPTS="-W" BUILDDIR="$HOME/docs" OUTDIR=${CIRCLE_TAG:-$BRANCH} html
351353
- save_cache:
352354
key: docs-v2-{{ .Branch }}-{{ .Revision }}
353355
paths:
@@ -458,9 +460,6 @@ jobs:
458460
deploy_docs_tag:
459461
<<: *docs
460462

461-
deploy_docs_master:
462-
<<: *docs
463-
464463
workflows:
465464
version: 2
466465
build_deploy:
@@ -520,17 +519,6 @@ workflows:
520519
tags:
521520
only: /.*/
522521

523-
- deploy_docs_master:
524-
requires:
525-
- build_n_pytest
526-
- test_package
527-
- build_docs
528-
filters:
529-
branches:
530-
only: /master/
531-
tags:
532-
ignore: /.*/
533-
534522
- deploy_docs_tag:
535523
requires:
536524
- deploy_docker

0 commit comments

Comments
 (0)