diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aafc3d28746043e09d343dd85a27db17b51297ee..f274f9a541a77c0a3b2d2b5b153c907a77870aff 100644 --- 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: diff --git a/README.rst b/README.rst index 1c0de2b53590ab6579ce8534709f1e34afb4f51b..db2789098937fb0d096ece1a6c2bb96eded15934 100644 --- a/README.rst +++ b/README.rst @@ -28,6 +28,13 @@ Changelog -------------------------------------------------------------------------------- +Version 0.1.15 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Released 2022-11-02 + +- Allowed adding files from previous versions using Gitlab CI/CD. + Version 0.1.14 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/typedcols.py b/typedcols.py index 9db4dd70728e486bb96dfdeb7e299b08dd808135..5c3468d3d994eb2807f3fd1f20c36ca2e54f13a2 100644 --- a/typedcols.py +++ b/typedcols.py @@ -10,7 +10,7 @@ Defines TypedDict and TypedList, which enforce inserted types based on simple type definition. """ -__version__ = '0.1.14' +__version__ = '0.1.15' __author__ = 'Pavel Kácha <pavel.kacha@cesnet.cz>' try: # Python 2