diff --git a/.github/workflows/test-overall.yml b/.github/workflows/test-overall.yml index b2d4ab7..99dcfbb 100644 --- a/.github/workflows/test-overall.yml +++ b/.github/workflows/test-overall.yml @@ -120,7 +120,7 @@ jobs: run: | cat sundials_env.sh source sundials_env.sh && - env && + env | sort && tox env: TOXENV: ${{ matrix.tox-env }} diff --git a/upload_api_docs.sh b/upload_api_docs.sh index 7b54c19..2d7d2ac 100755 --- a/upload_api_docs.sh +++ b/upload_api_docs.sh @@ -2,23 +2,23 @@ set -e -if [ "$TRAVIS_REPO_SLUG" = "bmcage/odes" -o "$DOCTR_DEPLOY" ]; then +if [ "$GITHUB_REPOSITORY" = "bmcage/odes" ] && [ "$DOCTR_DEPLOY" ]; then deploy="true" else deploy="false" fi -if [ -z "$TRAVIS_TAG" ]; then +if [ "tag" = "$GITHUB_REF_TYPE" ]; then DEPLOY_DIR=dev; else - DEPLOY_DIR="version-$TRAVIS_TAG"; + DEPLOY_DIR="version-$GITHUB_REF_NAME"; fi make -C apidocs html if [ $deploy = "true" ]; then - doctr deploy --no-require-master --build-tags --command "$VIRTUAL_ENV/bin/python build_index.py" --built-docs apidocs/_build/html $DEPLOY_DIR + doctr deploy --no-require-master --build-tags --command "$VIRTUAL_ENV/bin/python build_index.py" --built-docs apidocs/_build/html "$DEPLOY_DIR" else echo 'Not deploying docs, set DOCTR_DEPLOY to do deployment of docs' fi