Compare commits

...
Sign in to create a new pull request.

25 commits

Author SHA1 Message Date
Travis Ralston
0996956308 Add webpack config to override UI components with customisation 2021-12-16 18:20:31 +01:00
Travis Ralston
86a4d70bcf Webpack config for widget customisation endpoint 2021-12-16 18:20:28 +01:00
Tom
e2a4d7a568 Replacing the education translations with more generic ones. This is _still_ not a sustainable approach. 2021-12-16 18:17:31 +01:00
Tom
12fb012b6f Adding missing translations 2021-12-16 18:16:58 +01:00
Tom
118bd8f4fa Replacing the education translations with more generic ones. This is _still_ not a sustainable approach. 2021-12-16 18:16:54 +01:00
Ben Banfield-Zanin
2f9122d456 s/JS_SDK_REF/JS_SDK_BRANCH/ 2021-12-16 18:13:04 +01:00
Tom
c9ac4d2bf2 Update .gitlab-ci.yml 2021-12-16 18:13:04 +01:00
Arun Neelicattu
5e13a30065 ci: use toml/changes branch for react-sdk testing 2021-12-16 18:13:04 +01:00
Tom
ba11162cee Testing bundling all the translation changes into eleweb. Not a long term solution. 2021-12-16 18:13:01 +01:00
Arun Babu Neelicattu
341d41965f Revert "ci: build container without cache"
This reverts commit 19c33f988d13ec1705187c8c60d848960af7a56c.
2021-12-16 18:12:10 +01:00
Arun Neelicattu
186b4cb3f8 ci: build container without cache 2021-12-16 18:12:10 +01:00
Tom
b338f3f9bb Translate the static jitsi file to German 2021-12-16 18:12:10 +01:00
Travis Ralston
0f31e9f23a Fix build? 2021-12-16 18:12:10 +01:00
Travis Ralston
8944b48e2d Pin js-sdk 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
e69e3ae90f I hate bash 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
72596694af Attempt to make master build latest again 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
3faccf182e Do spaces help? 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
70743d0b9a Use some bashisms? 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
b1a29294e6 Attempt to use nice ref names when possible 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
3547e468c2 Document what the tag will be 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
159adcc87f Remove SDK directories after use 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
40936b3bf6 Blank script tags aren't allowed 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
f41b1c831c Add stub script 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
2bfff82b30 Improve the pipeline to attempt to distinguish branches for react-sdk 2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin
b09fa73160 Gitlab pipeline 2021-12-16 18:10:21 +01:00
4 changed files with 3206 additions and 13 deletions

30
.gitlab-ci.yml Normal file
View 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

View file

@ -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>

View file

@ -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: {