diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e4e89f0bf7238efba146f7444dd209c3248a2d6..4fc441807a0641b1d951ccf7a678b65fd26f053e 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 18c66e7849c2f0a1074e9bf4fffa359534a2e081..80be568e1f587e2341695239657e28dfa67a4bdf 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 b7429b5b0d23178515ff4d4670a47640e560e5f9..4e0761f8e3b796cabfca30d3cc60abf2ee076779 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",