From 5d5cc20730d54bce383a022ff9e8df4168a3971b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFs=20Poujade?= <lois.poujade@tetras-libre.fr>
Date: Tue, 17 Jan 2023 16:52:05 +0100
Subject: [PATCH] Adapt for gitlab pages demo
---
.gitlab-ci.yml | 15 ++++++++-------
package-lock.json | 10 +++++-----
package.json | 4 ++--
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e4e89f..4fc4418 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,15 @@
-upstream_tests:
+pages:
+ stage: deploy
image: docker.io/node:current
before_script:
- npm ci
+ - npm run build
script:
- - npm run test:ci
+ - rm -rf public
+ - cp -r demo/dist public
artifacts:
- when: always
paths:
- - junit.xml
- reports:
- junit: junit.xml
-
+ - public
+ rules:
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
diff --git a/package-lock.json b/package-lock.json
index 18c66e7..80be568 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
"jest-canvas-mock": "^2.2.0",
"jest-junit": "^15.0.0",
"jest-localstorage-mock": "^2.4.2",
- "mirador": "git+https://gitlab.tetras-libre.fr/iiif/mirador-video-annotation#annotation-on-video",
+ "mirador": "git+https://gitlab.tetras-libre.fr/lpo/mirador-video-annotations.git#gh3538-captions",
"nwb": "^0.24.7",
"prop-types": "^15.7.2",
"react": "^16.8",
@@ -54,7 +54,7 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.52",
"lodash": "^4.17.11",
- "mirador": "git+https://gitlab.tetras-libre.fr/iiif/mirador-video-annotation#annotation-on-video",
+ "mirador": "git+https://gitlab.tetras-libre.fr/lpo/mirador-video-annotations.git#gh3538-captions",
"prop-types": "^15.7.2",
"react": "^16.8",
"react-dom": "^16.8",
@@ -15514,7 +15514,7 @@
},
"node_modules/mirador": {
"version": "3.3.0",
- "resolved": "git+https://gitlab.tetras-libre.fr/iiif/mirador-video-annotation#047b206353616adc135bcd3b018da9857c4222d6",
+ "resolved": "git+https://gitlab.tetras-libre.fr/lpo/mirador-video-annotations.git#a12e9908c40ced924cf622766879dbaf6c74886e",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
@@ -34987,9 +34987,9 @@
}
},
"mirador": {
- "version": "git+https://gitlab.tetras-libre.fr/iiif/mirador-video-annotation#047b206353616adc135bcd3b018da9857c4222d6",
+ "version": "git+https://gitlab.tetras-libre.fr/lpo/mirador-video-annotations.git#a12e9908c40ced924cf622766879dbaf6c74886e",
"dev": true,
- "from": "mirador@git+https://gitlab.tetras-libre.fr/iiif/mirador-video-annotation#annotation-on-video",
+ "from": "mirador@git+https://gitlab.tetras-libre.fr/lpo/mirador-video-annotations.git#gh3538-captions",
"requires": {
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.9.1",
diff --git a/package.json b/package.json
index b7429b5..4e0761f 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.52",
"lodash": "^4.17.11",
- "mirador": "git+https://gitlab.tetras-libre.fr/iiif/mirador-video-annotation#annotation-on-video",
+ "mirador": "git+https://gitlab.tetras-libre.fr/lpo/mirador-video-annotations.git#gh3538-captions",
"prop-types": "^15.7.2",
"react": "^16.8",
"react-dom": "^16.8",
@@ -66,7 +66,7 @@
"jest-canvas-mock": "^2.2.0",
"jest-junit": "^15.0.0",
"jest-localstorage-mock": "^2.4.2",
- "mirador": "git+https://gitlab.tetras-libre.fr/iiif/mirador-video-annotation#annotation-on-video",
+ "mirador": "git+https://gitlab.tetras-libre.fr/lpo/mirador-video-annotations.git#gh3538-captions",
"nwb": "^0.24.7",
"prop-types": "^15.7.2",
"react": "^16.8",
--
GitLab