Commit c27d8341 authored by Nils Windisch's avatar Nils Windisch
Browse files

rename-qviewer-to-tido

parent ea57f65a
......@@ -13,26 +13,26 @@ update-viewer:
- if: '$UPDATE == "true"'
- if: '$UPSTREAM_COMMIT_SHA'
script:
- 'curl --request PUT --header "PRIVATE-TOKEN: $PROJECT_ACCESS_TOKEN" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/repository/submodules/Qviewer" --data "branch=develop&commit_sha=$UPSTREAM_COMMIT_SHA&commit_message=update: Qviewer"'
- 'curl --request PUT --header "PRIVATE-TOKEN: $PROJECT_ACCESS_TOKEN" "$CI_API_V4_URL/projects/$CI_PROJECT_ID/repository/submodules/tido" --data "branch=develop&commit_sha=$UPSTREAM_COMMIT_SHA&commit_message=update: TIDO"'
# build the frontend viewer with a custom index.html
build:
image: docker.gitlab.gwdg.de/subugoe/emo/qviewer/node:latest
image: docker.gitlab.gwdg.de/subugoe/emo/tido/node:latest
stage: build
variables:
# when we want to include the frontend-templating, we have to use recursive
GIT_SUBMODULE_STRATEGY: normal
script:
- ./set-entrypoint.sh
- cp --force index.html Qviewer/src/index.template.html
- cd Qviewer
- cp --force index.html tido/src/index.template.html
- cd tido
- npm install
- npm run build
- npm run tweak:build
artifacts:
expire_in: 3 mos
paths:
- Qviewer/dist/
- tido/dist/
- ahikar.css
# when a git flow release is made, a tag will be pushed starting this job. it
......
[submodule "Qviewer"]
path = Qviewer
url = ../../emo/Qviewer.git
[submodule "tido"]
path = tido
url = ../../emo/tido.git
......@@ -41,7 +41,7 @@ Bots attempting to will cause failing pipelines because they don't have access r
### Added
- CI job receiving upstream updates of submodule Qviewer
- CI job receiving upstream updates of submodule TIDO
## 0.6.0 - 2020-10-19
......@@ -59,13 +59,13 @@ Bots attempting to will cause failing pipelines because they don't have access r
### Changed
- updated the QViewer (commit in the viewer's repo: 521f98fe)
- updated the TIDO (commit in the viewer's repo: 521f98fe)
## [0.3.0] - 2020-07-10
### Changed
- updated the QViewer (commit in the viewer's repo: 299ece9f)
- updated the TIDO (commit in the viewer's repo: 299ece9f)
## [0.2.0] - 2020-05-29
......
......@@ -15,12 +15,12 @@ The project specific configuration of the viewer is done in `index.html`. This f
To add a specific styling of the text in accordance with the project's requirements a
specific stylesheet, `ahikar.css`, is available.
The file is going to be included in the build of the QViewer application.
The file is going to be included in the build of the TIDO application.
For local development copy the two files like shown below.
```bash
cp --force index.html Qviewer/src/index.template.html
cp --force ahikar.css Qviewer/src/statics/support.css
cp --force index.html tido/src/index.template.html
cp --force ahikar.css tido/src/statics/support.css
```
You do not have to track the copied files in the version control system.
......@@ -29,10 +29,10 @@ You do not have to track the copied files in the version control system.
### Upstream
The submodule Qviewer (= TIDO) will receive updates from its upstream project automatically.
The submodule TIDO will receive updates from its upstream project automatically.
The pipeline will be triggered by the upstream after a merge on TIDO's `main` branch and passes the necessary upstream commit SHA.
For convinence we MAY add a manual job trigger in the upstream repository.
The upstream currently is: [subugoe/emo/Qviewer](https://gitlab.gwdg.de/subugoe/emo/Qviewer).
The upstream currently is: [subugoe/emo/tido](https://gitlab.gwdg.de/subugoe/emo/tido).
### Downstream
......
#!/bin/bash
# this script sets the entrypoint for the Qviewer that depends on the
# this script sets the entrypoint for the TIDO that depends on the
# branch it is build from.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment