From fce793aa1567eaa797137485e18fae8de5b6afad Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Thu, 5 Jan 2023 18:20:10 +0000 Subject: [PATCH 1/5] Fixing automatic build Need to install tox, and credentials were being truncated --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4998763..7fc1176 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,7 @@ build-docs: image: python:3.8 stage: build script: + - pip install tox - tox -e build deploy-job: @@ -30,7 +31,9 @@ deploy-job: script: - mkdir -p local - echo "USERNAME=$FTP_USERNAME" > local/.credentials - - echo "PASSWORF=$FTP_PASSWORD" > local/.credentials + - echo "PASSWORF=$FTP_PASSWORD" >> local/.credentials + - pip install tox + - tox -e build - tox -e publish # Only publish on protected branches. This avoids publish for merge requests rules: -- GitLab From 0f57f934f2d3358982365500858cb5310fcb77b7 Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Thu, 5 Jan 2023 18:24:48 +0000 Subject: [PATCH 2/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7fc1176..0849c81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,19 +15,25 @@ # limitations under the License. ####################################################################################### -stages: - - build - - deploy - build-docs: image: python:3.8 + variables: + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + cache: + paths: + - .cache/pip stage: build script: - pip install tox - tox -e build deploy-job: - stage: deploy + image: python:3.8 + variables: + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + cache: + paths: + - .cache/pip script: - mkdir -p local - echo "USERNAME=$FTP_USERNAME" > local/.credentials -- GitLab From 4025cbb41149c4bcafbe6901fb805f2b1cb75d7f Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Thu, 5 Jan 2023 18:29:12 +0000 Subject: [PATCH 3/5] Update tox.ini --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 4fc4841..5eb484d 100644 --- a/tox.ini +++ b/tox.ini @@ -53,7 +53,7 @@ commands = rm -rf _build/html sphinx-multiversion . _build/html sh -c './fix_cross_references.sh' -whitelist_externals = +allowlist_externals = sh rm @@ -65,7 +65,7 @@ commands = sphinx-multiversion . _build/html sphinx-autobuild . -b dirhtml -a _build/html --host 0.0.0.0 --port 8001 # sh -c './fix_cross_references.sh' -whitelist_externals = +allowlist_externals = sh rm @@ -75,7 +75,7 @@ whitelist_externals = deps = {[testenv]deps} commands = sh -c './upload_doc.sh' -whitelist_externals = +allowlist_externals = sh rm -- GitLab From c6349c4474918d399e5e362135403e02ad81bfa3 Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Thu, 5 Jan 2023 18:33:26 +0000 Subject: [PATCH 4/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0849c81..94764e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,9 @@ build-docs: - .cache/pip stage: build script: + - mkdir -p local + - echo "USERNAME=$FTP_USERNAME" > local/.credentials + - echo "PASSWORF=$FTP_PASSWORD" >> local/.credentials - pip install tox - tox -e build -- GitLab From 0e56370d2f0c1a8f7de31d4d4f5e040650d78d26 Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Thu, 5 Jan 2023 18:36:48 +0000 Subject: [PATCH 5/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94764e4..0849c81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,9 +24,6 @@ build-docs: - .cache/pip stage: build script: - - mkdir -p local - - echo "USERNAME=$FTP_USERNAME" > local/.credentials - - echo "PASSWORF=$FTP_PASSWORD" >> local/.credentials - pip install tox - tox -e build -- GitLab