Merge branch 'devel' into 'master'

Update pynspect/__init__.py, README.rst, .gitlab-ci.yml See merge request 709/mentat/pynspect!17

Merge branch 'devel' into 'master'
56aae591 · Rajmund Hruška · a23b369e · b935bbc4 · 56aae591 · 56aae591
Commit 56aae591 authored 2 years ago by Rajmund Hruška
--- 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:

--- 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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^


--- a/pynspect/__init__.py
+++ b/pynspect/__init__.py
@@ -16,4 +16,4 @@ data structures.
 """


-__version__ = "0.21"
+__version__ = "0.22"