Merge branch 'develop' into johannes/webpack-5

element-hq · Nov 6, 2023 · 17147ad · 17147ad
2 parents d8f46ab + 019a7cc
commit 17147ad
Show file tree

Hide file tree

Showing 21 changed files with 2,812 additions and 279 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
 

diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
@@ -23,7 +23,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
 

diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml
@@ -12,11 +12,24 @@ jobs:
         name: Docker Buildx
         runs-on: ubuntu-latest
         environment: dockerhub
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - variant: vanilla
+                    # Variant we ship to aid ESS in providing a build on the OpenCoDE platform including specific modules
+                    - variant: opendesk
+                      flavor: suffix=-opendesk,onlatest=true
+                      prepare: mv variants/openDesk/* .
         steps:
             - uses: actions/checkout@v4
               with:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
+            - name: Prepare
+              if: matrix.prepare
+              run: ${{ matrix.prepare }}
+
             - name: Set up QEMU
               uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
 
@@ -42,6 +55,7 @@ jobs:
                       type=ref,event=tag
                   flavor: |
                       latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
+                      ${{ matrix.flavor }}
 
             - name: Build and push
               uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -42,13 +42,25 @@ jobs:
                   repository: matrix-org/matrix-js-sdk
                   path: matrix-js-sdk
 
+            - uses: actions/setup-node@v4
+              with:
+                  cache: "yarn"
+                  cache-dependency-path: element-web/yarn.lock
+
+            - name: Generate automations docs
+              working-directory: element-web
+              run: |
+                  yarn install --frozen-lockfile
+                  yarn ts-node ./scripts/gen-workflow-mermaid.ts ../element-desktop ../element-web ../matrix-react-sdk ../matrix-js-sdk > docs/automations.md
+                  echo "-   [Automations](automations.md)" >> docs/SUMMARY.md
+
             - name: Setup mdBook
               uses: peaceiris/actions-mdbook@v1
               with:
                   mdbook-version: "0.4.10"
 
-            - name: Install mdbook-combiner
-              run: cargo install mdbook-combiner
+            - name: Install mdbook extensions
+              run: cargo install mdbook-combiner mdbook-mermaid
 
             - name: Prepare docs
               run: |
@@ -58,6 +70,7 @@ jobs:
                   mv element-desktop/docs "docs/Element Desktop"
 
                   mv element-web/README.md element-web/docs/
+                  mv element-web/docs/lib docs/
                   mv element-web/docs "docs/Element Web"
 
                   mv matrix-react-sdk/README.md matrix-react-sdk/docs/

diff --git a/.github/workflows/release_prepare.yml b/.github/workflows/release_prepare.yml
@@ -0,0 +1,81 @@
+name: Cut branches
+on:
+    workflow_dispatch:
+        inputs:
+            element-desktop:
+                description: Prepare element-desktop
+                required: true
+                type: boolean
+                default: true
+            element-web:
+                description: Prepare element-web
+                required: true
+                type: boolean
+                default: true
+            matrix-react-sdk:
+                description: Prepare matrix-react-sdk
+                required: true
+                type: boolean
+                default: true
+            matrix-js-sdk:
+                description: Prepare matrix-js-sdk
+                required: true
+                type: boolean
+                default: true
+jobs:
+    prepare:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout Element Desktop
+              uses: actions/checkout@v4
+              if: inputs.element-desktop
+              with:
+                  repository: vector-im/element-desktop
+                  path: element-desktop
+                  ref: staging
+                  fetch-depth: 0
+                  fetch-tags: true
+                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+            - name: Checkout Element Web
+              uses: actions/checkout@v4
+              if: inputs.element-web
+              with:
+                  repository: vector-im/element-web
+                  path: element-web
+                  ref: staging
+                  fetch-depth: 0
+                  fetch-tags: true
+                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+            - name: Checkout Matrix React SDK
+              uses: actions/checkout@v4
+              if: inputs.matrix-react-sdk
+              with:
+                  repository: matrix-org/matrix-react-sdk
+                  path: matrix-react-sdk
+                  ref: staging
+                  fetch-depth: 0
+                  fetch-tags: true
+                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+            - name: Checkout Matrix JS SDK
+              uses: actions/checkout@v4
+              if: inputs.matrix-js-sdk
+              with:
+                  repository: matrix-org/matrix-js-sdk
+                  path: matrix-js-sdk
+                  ref: staging
+                  fetch-depth: 0
+                  fetch-tags: true
+                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+            - name: Resolve repos
+              run: |
+                  echo "REPOS=$(ls . | tr '\n' ' ')" >> $GITHUB_ENV
+
+            - name: Merge develop
+              run: |
+                  git config --global user.email "[email protected]"
+                  git config --global user.name "RiotRobot"
+                  for REPO in $REPOS; do git -C "$REPO" merge origin/develop; done
+
+            - name: Push staging
+              run: for REPO in $REPOS; do git -C "$REPO" push origin staging; done
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -16,7 +16,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
 
@@ -36,7 +36,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
 
@@ -53,7 +53,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
 
@@ -70,7 +70,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -18,7 +18,7 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Yarn cache
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   cache: "yarn"
 

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
@@ -151,7 +151,7 @@ jobs:
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
             - id: set_fields
-              uses: titoportas/update-project-fields@020b5aa9db8f9501d4b16d6417c2132ff26e6279 # v0.1.0
+              uses: titoportas/update-project-fields@421a54430b3cdc9eefd8f14f9ce0142ab7678751 # v0.1.0
               with:
                   project-url: ${{ env.PROJECT_URL }}
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ electron/pub
 /src/modules.ts
 /build_config.yaml
 /book
+/index.html
diff --git a/.prettierignore b/.prettierignore
@@ -22,6 +22,7 @@ electron/pub
 # Raises an error because it contains a template var breaking the script tag
 src/vector/index.html
 src/vector/modernizr.js
+/docs/lib
 
 # This file is owned, parsed, and generated by allchange, which doesn't comply with prettier
 /CHANGELOG.md
diff --git a/book.toml b/book.toml
@@ -24,3 +24,9 @@ git-repository-url = "https://github.com/vector-im/element-web"
 
 # The path that the docs are hosted on
 site-url = "/element-web/"
+additional-js = ["docs/lib/mermaid.min.js", "docs/lib/mermaid-init.js"]
+
+[preprocessor]
+
+[preprocessor.mermaid]
+command = "mdbook-mermaid"