diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 411d4bb940cb9c087407498780707895feff3120..9b932f6f76e6e8e20910474272b80af7fb1acb9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,7 +82,11 @@ load_frontend-all: - 'curl --output frontend.zip --header "PRIVATE-TOKEN: $GITLAB_TOKEN" "$CI_API_V4_URL/projects/$FRONTEND_REPO_ID/jobs/artifacts/develop/download?job=build"' - unzip frontend.zip - mkdir -p docker/frontend - - mv Qviewer/dist/* docker/frontend/ + - cp Qviewer/dist/* docker/frontend/ + - mkdir docker/frontend/syriac && mkdir docker/frontend/arabic-karshuni + - cp Qviewer/dist/* docker/frontend/syriac + - sed -i 's/textapi\/ahikar\/arabic-karshuni/textapi\/ahikar\/syriac/' docker/frontend/syriac/index.html + - cp Qviewer/dist/* docker/frontend/arabic-karshuni artifacts: paths: - docker/frontend/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 53e8333ceb7097a2053a6b858b0a723b5e73b47a..5847bcfc7d66989a7ba7fa5f35af07241ee6e35a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.1.1] - 2021-01-27 + +### Fixed + +- rename `master.build.properties` to `main.build.properties` to match the actual branch names. +This is necessary to build a package and upload it to our package store (ci.de.dariah.eu). + +## [3.1.0] - 2021-01-27 + +### Changed + +- provide two instances of the viewer, one for Syriac and one for Arabic/Karshuni texts + ## [3.0.1] - 2021-01-27 ### Changed diff --git a/exist-app/build.properties b/exist-app/build.properties index fd1dd02cff31cb4afe7819760b18ae05a69d95db..64529fbb06c41c8472643327c58c8c789250b1dc 100644 --- a/exist-app/build.properties +++ b/exist-app/build.properties @@ -1,5 +1,5 @@ project.name=https://ahikar-test.sub.uni-goettingen.de/ -project.version=3.0.1 +project.version=3.1.1 project.title=Ahiqar project.abbrev=ahikar-test project.processorversion=5.2.0 diff --git a/exist-app/master.build.properties b/exist-app/main.build.properties similarity index 100% rename from exist-app/master.build.properties rename to exist-app/main.build.properties