Compare commits
25 commits
develop
...
dataport/r
Author | SHA1 | Date | |
---|---|---|---|
|
0996956308 | ||
|
86a4d70bcf | ||
|
e2a4d7a568 | ||
|
12fb012b6f | ||
|
118bd8f4fa | ||
|
2f9122d456 | ||
|
c9ac4d2bf2 | ||
|
5e13a30065 | ||
|
ba11162cee | ||
|
341d41965f | ||
|
186b4cb3f8 | ||
|
b338f3f9bb | ||
|
0f31e9f23a | ||
|
8944b48e2d | ||
|
e69e3ae90f | ||
|
72596694af | ||
|
3faccf182e | ||
|
70743d0b9a | ||
|
b1a29294e6 | ||
|
3547e468c2 | ||
|
159adcc87f | ||
|
40936b3bf6 | ||
|
f41b1c831c | ||
|
2bfff82b30 | ||
|
b09fa73160 |
4 changed files with 3206 additions and 13 deletions
30
.gitlab-ci.yml
Normal file
30
.gitlab-ci.yml
Normal file
|
@ -0,0 +1,30 @@
|
|||
stages:
|
||||
- build
|
||||
|
||||
variables:
|
||||
USE_CUSTOM_SDKS: "true"
|
||||
JS_SDK_BRANCH: "release-v9.8.0"
|
||||
JS_SDK_REPO: "https://github.com/matrix-org/matrix-js-sdk.git"
|
||||
REACT_SDK_REPO: "https://gitlab-ci-token:$GL_BAYERN_REACT_SDK_TOKEN@gitlab.matrix.org/new-vector/dataport/bayern-react-sdk"
|
||||
REACT_SDK_BRANCH: "master"
|
||||
|
||||
docker-build:
|
||||
tags: ['shell']
|
||||
stage: build
|
||||
before_script:
|
||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||
- "[ -d './js-sdk' ] && rm -rf ./js-sdk"
|
||||
- "[[ $JS_SDK_BRANCH != 'master' ]] && git clone --depth 1 --branch $JS_SDK_BRANCH $JS_SDK_REPO js-sdk && cd js-sdk && export JS_SDK_SHA=$(git rev-parse --short=12 HEAD) && cd ../ && rm -rf js-sdk"
|
||||
- "[[ $JS_SDK_BRANCH == 'master' ]] && export JS_SDK_SHA=master"
|
||||
- "[ -d './react-sdk' ] && rm -rf ./react-sdk"
|
||||
- "[[ $REACT_SDK_BRANCH != 'master' ]] && git clone --depth 1 --branch $REACT_SDK_BRANCH $REACT_SDK_REPO react-sdk && cd react-sdk && export REACT_SDK_SHA=$(git rev-parse --short=12 HEAD) && cd ../ && rm -rf react-sdk"
|
||||
- "[[ $REACT_SDK_BRANCH == 'master' ]] && export REACT_SDK_SHA=master"
|
||||
- "[[ $CI_COMMIT_BRANCH != 'master' ]] && export ELEMENT_WEB_SHA=$(git rev-parse --short=12 HEAD)"
|
||||
- "[[ $CI_COMMIT_BRANCH == 'master' ]] && export ELEMENT_WEB_SHA=master"
|
||||
- "[[ -v CI_COMMIT_TAG ]] && export SPECIAL_DOCKER_TAG=$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
|
||||
- "([[ $CI_COMMIT_BRANCH == 'master' ]] && [[ $REACT_SDK_BRANCH == 'master' ]] && [[ $JS_SDK_BRANCH == 'master' ]]) && export SPECIAL_DOCKER_TAG=$CI_REGISTRY_IMAGE:latest"
|
||||
- '[[ -z $SPECIAL_DOCKER_TAG ]] && export DOCKER_TAG="$CI_REGISTRY_IMAGE:$ELEMENT_WEB_SHA-react-$REACT_SDK_SHA-js-$JS_SDK_SHA" || export DOCKER_TAG="$SPECIAL_DOCKER_TAG"'
|
||||
script:
|
||||
- echo "Docker tag will be $DOCKER_TAG"
|
||||
- docker build --pull -t "$DOCKER_TAG" --build-arg "USE_CUSTOM_SDKS=$USE_CUSTOM_SDKS" --build-arg "JS_SDK_BRANCH=$JS_SDK_BRANCH" --build-arg "JS_SDK_REPO=$JS_SDK_REPO" --build-arg "REACT_SDK_REPO=$REACT_SDK_REPO" --build-arg "REACT_SDK_BRANCH=$REACT_SDK_BRANCH" .
|
||||
- docker push "$DOCKER_TAG"
|
File diff suppressed because it is too large
Load diff
|
@ -11,9 +11,9 @@
|
|||
<div class="joinConferencePrompt">
|
||||
<span class="icon"><!-- managed by CSS --></span>
|
||||
<!-- TODO: i18n -->
|
||||
<h2>Jitsi Video Conference</h2>
|
||||
<h2>Videokonferenz</h2>
|
||||
<div id="widgetActionContainer">
|
||||
<button type="button" id="joinButton">Join Conference</button>
|
||||
<button type="button" id="joinButton">Videokonferenz beitreten</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -39,6 +39,17 @@ function getActiveThemes() {
|
|||
return themes;
|
||||
}
|
||||
|
||||
const additionalPlugins = [
|
||||
new webpack.NormalModuleReplacementPlugin(
|
||||
/src[\/\\]customisations[\/\\]WidgetVariables\.ts/,
|
||||
path.resolve(require.resolve("matrix-react-sdk/package.json"), '..', 'src', 'customisations', 'bayern', 'BayernWidgetVariableCustomisations.ts'),
|
||||
),
|
||||
new webpack.NormalModuleReplacementPlugin(
|
||||
/src[\/\\]customisations[\/\\]ComponentVisibility\.ts/,
|
||||
path.resolve(require.resolve("matrix-react-sdk/package.json"), '..', 'src', 'customisations', 'bayern', 'BayernComponentVisibilityCustomisations.ts'),
|
||||
),
|
||||
];
|
||||
|
||||
module.exports = (env, argv) => {
|
||||
// Establish settings based on the environment and args.
|
||||
//
|
||||
|
@ -546,6 +557,7 @@ module.exports = (env, argv) => {
|
|||
include: "./webapp/bundles",
|
||||
}),
|
||||
new webpack.EnvironmentPlugin(['VERSION']),
|
||||
...additionalPlugins,
|
||||
].filter(Boolean),
|
||||
|
||||
output: {
|
||||
|
|
Loading…
Add table
Reference in a new issue