diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 609009d00a4eb24fdeb45059b0e6b72b0ee4092c..c38f56968aed1f151139f7f15990ec993d94057e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,13 @@ variables: TRIGGERED_BY_REF: $CI_COMMIT_REF_NAME TRIGGERED_BY_HASH: $CI_COMMIT_SHORT_SHA + WEBUI: "" + PYLIB: "" + CPPLIB: "" + PYINT: "" + CPPINT: "" + MYSQLBACKEND: "" + image: $CI_REGISTRY_IMAGE stages: - info @@ -49,6 +56,12 @@ info: - echo "Pipeline triggered by $TRIGGERED_BY_REPO@$TRIGGERED_BY_REF ($TRIGGERED_BY_HASH)" - echo "Pipeline will trigger DEPLOY with branch $DEPLOY_REF" - echo "F_BRANCH = $F_BRANCH" + - echo "WEBUI = $WEBUI" + - echo "PYLIB = $PYLIB" + - echo "CPPLIB = $CPPLIB" + - echo "PYINT = $PYINT" + - echo "CPPINT = $CPPINT" + - echo "MYSQLBACKEND = $MYSQLBACKEND" # Setup: Build a docker image in which tests for this repository can run @@ -79,6 +92,19 @@ test: - mvn antlr4:antlr4 - mvn compile - mvn test + - echo "TMP_MYSQLBACKEND=${MYSQLBACKEND}" >> dotenv.env + - echo "TMP_WEBUI=${WEBUI}" >> dotenv.env + - echo "TMP_SERVER=${SERVER}" >> dotenv.env + - echo "TMP_CPPINT=${CPPINT}" >> dotenv.env + - echo "TMP_CPPLIB=${CPPLIB}" >> dotenv.env + - echo "TMP_PYLIB=${PYLIB}" >> dotenv.env + - echo "TMP_PYINT=${PYINT}" >> dotenv.env + - cat dotenv.env + artifacts: + reports: + dotenv: dotenv.env + + # Deploy: Trigger building of server image and integration tests trigger_inttest: @@ -86,8 +112,6 @@ trigger_inttest: needs: [ test ] inherit: variables: - # List the variables that shall be inherited, which also means they will override any equally - # named varibles in child pipelines. - DEPLOY_REF - TRIGGERED_BY_REPO - TRIGGERED_BY_REF @@ -96,6 +120,12 @@ trigger_inttest: # Renaming variables. F_BRANCH: $CI_COMMIT_REF_NAME SERVER: $CI_COMMIT_REF_NAME + WEBUI: $TMP_WEBUI + PYLIB: $TMP_PYLIB + CPPLIB: $TMP_CPPLIB + PYINT: $TMP_PYINT + CPPINT: $TMP_CPPINT + MYSQLBACKEND: $TMP_MYSQLBACKEND trigger: project: caosdb/src/caosdb-deploy branch: $DEPLOY_REF diff --git a/CHANGELOG.md b/CHANGELOG.md index d2924e75f1b0ab4b6cbc43c4cbbf7ecd7787838f..ce244bd7a1dbc0215019fba9fe3fe637ca266b4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + + +## [0.8.0] - 2022-07-12 +(Timm Fitschen) + +### Added + * Configurable requirements for user names and passwords. The default is the old hard-coded configuration. ### Changed diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index ba9de363576a963eb9696baf3244c06559279bce..0f380b923c39129a7f29e380436857a3e9c6d8f6 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -12,7 +12,7 @@ ## For Deploying a Web User Interface (optional) -* `>=caosdb-webui 0.6.0` +* `>=caosdb-webui 0.8.0` ## For Building the Documentation (optional) diff --git a/FEATURES.md b/FEATURES.md index 9cad165e562bcb55bb1b18f14ee3c5b55d328ba8..485172f0dd8c930e36a7c216d0d8a9dd7e8086f3 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -12,7 +12,7 @@ (caosdb.entity.v1.Query) in a single transaction. The server throws an error if it finds more than one query. * Legacy XML/HTTP API (Deprecated) -* Deployment of caosdb-webui (>=v0.4.1) +* Deployment of caosdb-webui (>=0.8.0) * Server-side Scripting API (v0.1) * CaosDB Query Language Processor * CaosDB FileSystem diff --git a/caosdb-webui b/caosdb-webui index 86dc30e3526f2eab97de5dcd53c8eaa12c0e42e6..f2884f7634e2b160f398cea49d5ce5cdefdda3d8 160000 --- a/caosdb-webui +++ b/caosdb-webui @@ -1 +1 @@ -Subproject commit 86dc30e3526f2eab97de5dcd53c8eaa12c0e42e6 +Subproject commit f2884f7634e2b160f398cea49d5ce5cdefdda3d8 diff --git a/pom.xml b/pom.xml index 733a5b4ca3c741fef0d611885327545eee8c0129..73877cbc31b7c6e72c69321f0d04819751452995 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.caosdb</groupId> <artifactId>caosdb-server</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-SNAPSHOT</version> <packaging>jar</packaging> <name>CaosDB Server</name> <scm> diff --git a/src/doc/conf.py b/src/doc/conf.py index ba98f7e554816f858f5664c084c20bc1b33167de..cc58ac578503b32c17a60575e64cd42aab304203 100644 --- a/src/doc/conf.py +++ b/src/doc/conf.py @@ -25,9 +25,9 @@ copyright = '2022, IndiScale GmbH' author = 'Daniel Hornung' # The short X.Y version -version = '0.8.0' +version = '0.9.0' # The full version, including alpha/beta/rc tags -release = '0.8.0-SNAPSHOT' +release = '0.9.0-SNAPSHOT' # -- General configuration ---------------------------------------------------