diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f518e1d9b01cff7e7efd330dec5cf64bdc228bd6..7e981e3dc0a87a1c90ebc368f3d7d1f743cb129a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -151,16 +151,17 @@ twine-job: pages: stage: deploy script: - - make docs - - curl -L --header "JOB-TOKEN:$CI_JOB_TOKEN" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/artifacts/devel/download?job=pages" -o devel.zip - - curl -L --header "JOB-TOKEN:$CI_JOB_TOKEN" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/artifacts/master/download?job=pages" -o master.zip - - unzip -n '*.zip' || true # Ignore not existing zipfiles - - mkdir -p public/"$CI_COMMIT_BRANCH" - - mkdir -p public/"$CI_COMMIT_BRANCH"/files - - cp -rf doc/_build/html public/"$CI_COMMIT_BRANCH" - - cp -rf dist/* public/"$CI_COMMIT_BRANCH"/files/. + - make docs # Create documentation + - curl -L --header "JOB-TOKEN:$CI_JOB_TOKEN" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/artifacts/devel/download?job=pages" -o devel.zip # Download docs and files from devel branch + - curl -L --header "JOB-TOKEN:$CI_JOB_TOKEN" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/artifacts/master/download?job=pages" -o master.zip # Download docs and files from master branch + - unzip -n '*.zip' || true # Unzip and ignore not existing zipfiles + - mkdir -p public/"$CI_COMMIT_BRANCH" # Create directory for docs if it doesn't exist + - mkdir -p public/"$CI_COMMIT_BRANCH"/files # Create directory for files if it doesn't exist + - cp -rf doc/_build/html public/"$CI_COMMIT_BRANCH" # Copy docs to shared folder + - cp -rf dist/* public/"$CI_COMMIT_BRANCH"/files/. # Copy files to shared folder + - 'if [ "$BACKUP_ZIPFILE_URL" != null ]; then curl "$BACKUP_ZIPFILE_URL" --output backup.zip; unzip -n backup.zip; fi' # Download backup files - cd public/"$CI_COMMIT_BRANCH"/files - - echo "<html><body><h1>Directory listing:</h1>" > ./index.html + - echo "<html><body><h1>Directory listing:</h1>" > ./index.html # Create directory listing - find -exec echo "<a href='{}'>{}</a><br/>" \; | sort >> ./index.html - echo "</body></html>" >> ./index.html artifacts: diff --git a/README.rst b/README.rst index d67cdd278a8882397d96d99a66ed745853b8e2dd..2929b40872f0c04bfeaa0054c1f9737b6ced736b 100644 --- a/README.rst +++ b/README.rst @@ -62,6 +62,13 @@ Changelog -------------------------------------------------------------------------------- +Version 0.22 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Released 2022-11-02 + +- Allowed adding files from previous versions using Gitlab CI/CD. + Version 0.21 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/pynspect/__init__.py b/pynspect/__init__.py index ccd0225d112992d5d991c8c9bcae4a4cb7285f79..4a2b405f2c34df02ede6fd3299d2b229896dd9fe 100644 --- a/pynspect/__init__.py +++ b/pynspect/__init__.py @@ -16,4 +16,4 @@ data structures. """ -__version__ = "0.21" +__version__ = "0.22"