Merge branch 'devel' into 'master'

[CI/CD] Download files located at BACKUP_ZIPFILE_URL See merge request 709/warden/idea!7

Merge branch 'devel' into 'master'
8c3fd872 · Rajmund Hruška · 3bfeeb64 · 9cd35a9c · 8c3fd872 · 8c3fd872
Commit 8c3fd872 authored 2 years ago by Rajmund Hruška
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,16 +157,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
@@ -29,6 +29,13 @@ Changelog
 --------------------------------------------------------------------------------


+Version 0.1.15
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Released 2022-11-02
+
+-   Allowed adding files from previous versions using Gitlab CI/CD.
+
 Version 0.1.14
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^


--- a/idea/__init__.py
+++ b/idea/__init__.py
@@ -4,5 +4,5 @@
 # Copyright (c) since 2016, CESNET, z. s. p. o.
 # Use of this source is governed by an ISC license, see LICENSE file.

-__version__ = '0.1.14'
+__version__ = '0.1.15'
 __author__ = 'Pavel Kácha <pavel.kacha@cesnet.cz>'