Merge branch 'develop' into johannes/webpack-5

.github/workflows/build_debian.yaml

@@ -31,38 +31,48 @@ jobs:
 
             - name: Prepare
               run: |
-                  mkdir -p /tmp/element-web-debian/DEBIAN
+                  mkdir -p debian/tmp/DEBIAN
-                  cp -R debian/ /tmp/element-web-debian/DEBIAN/
+                  find debian -maxdepth 1 -type f -exec cp "{}" debian/tmp/DEBIAN/ \;
-                  mkdir -p /tmp/element-web-debian/usr/share/element-web/
+                  mkdir -p debian/tmp/usr/share/element-web/
 
-                  tar -xf "element-$VERSION.tar.gz" -C /tmp/element-web-debian/usr/share/element-web --strip-components=1
+                  tar -xf "element-$VERSION.tar.gz" -C debian/tmp/usr/share/element-web --strip-components=1 --no-same-owner --no-same-permissions
-                  cp config.sample.json /tmp/element-web-debian/usr/share/element-web/config.json
+                  mv debian/tmp/usr/share/element-web/config{.sample,}.json
+
+            - name: Write changelog
+              run: |
+                  VERSION=$(cat package.json | jq -r .version)
+                  TIME=$(date -d "$PUBLISHED_AT" -R)
+                  {
+                      echo "element-web ($VERSION) default; urgency=medium"
+                      echo "$BODY" | sed 's/^##/\n  */g;s/^\*/  */g' | perl -pe 's/\[.+?]\((.+?)\)/\1/g'
+                      echo ""
+                      echo " -- $ACTOR <support@element.io>  $TIME"
+                  } > debian/tmp/DEBIAN/changelog
+              env:
+                  ACTOR: ${{ github.actor }}
+                  VERSION: ${{ github.event.release.tag_name }}
+                  BODY: ${{ github.event.release.body }}
+                  PUBLISHED_AT: ${{ github.event.release.published_at }}
 
             - name: Build deb package
               run: |
                   VERSION=$(cat package.json | jq -r .version)
-                  chmod -R u=rw,go=r /tmp/element-web-debian/usr/share/element-web/
+                  chmod -R u=rw,go=r debian/tmp/usr/share/element-web/
-                  dpkg-deb -Zxz --root-owner-group -VVersion=$VERSION --build /tmp/element-web-debian element-web.deb
+                  dpkg-gencontrol -v"$VERSION" -ldebian/tmp/DEBIAN/changelog
+                  dpkg-deb -Zxz --root-owner-group --build debian/tmp element-web.deb
 
-            # For now just upload the artifact to github
             - uses: actions/upload-artifact@v3
               with:
-                  name: debs
+                  name: element-web.deb
-                  path: "*.deb"
+                  path: element-web.deb
                   retention-days: 14
 
-            #- name: Upload incoming deb
+            - name: Publish to packages.element.io
-            #  if: github.event.release.prerelease == false
+              if: github.event.release.prerelease == false
-            #  run: aws s3 cp element-web.deb "s3://$R2_INCOMING_BUCKET" --endpoint-url "$R2_URL" --region auto
+              uses: vector-im/packages.element.io@master
-            #  env:
+              with:
-            #      AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+                  file: element-web.deb
-            #      AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
+                  bucket-api: ${{ vars.CF_R2_S3_API }}
-    #reprepro:
+                  bucket-key-id: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
-    #    needs: build
+                  bucket-access-key: ${{ secrets.CF_R2_TOKEN }}
-    #    name: Run reprepro
-    #    if: github.event.release.prerelease == false
-    #    uses: ./.github/workflows/reprepro.yaml
-    #    secrets: inherit
-    #    with:
-    #        incoming: element-web.deb

debian/.gitignore

@@ -0,0 +1,2 @@
+/files
+/tmp

debian/control

@@ -1,12 +1,13 @@
-Package: element-web
+Source: element-web
-License: Apache-2.0
-Vendor: support@element.io
-Architecture: all
 Maintainer: support@element.io
-Recommends: element-io-archive-keyring
 Section: web
 Priority: optional
 Homepage: https://element.io/
-Version: ${Version}
+
+Package: element-web
+Architecture: all
+Recommends: httpd, element-io-archive-keyring
 Description:
   A feature-rich client for Matrix.org
+  This package contains the web-based client that can be served through a web
+   server.

package.json

@@ -71,7 +71,7 @@
     },
     "dependencies": {
         "@matrix-org/olm": "3.2.15",
-        "@matrix-org/react-sdk-module-api": "^2.1.0",
+        "@matrix-org/react-sdk-module-api": "^2.2.1",
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",

yarn.lock

@@ -1671,13 +1671,6 @@
   resolved "https://registry.yarnpkg.com/@matrix-org/olm/-/olm-3.2.15.tgz#55f3c1b70a21bbee3f9195cecd6846b1083451ec"
   integrity sha512-S7lOrndAK9/8qOtaTq/WhttJC/o4GAzdfK0MUPpo8ApzsJEC0QjtwrkC3KBXdFP1cD1MXi/mlKR7aaoVMKgs6Q==
 
-"@matrix-org/react-sdk-module-api@^2.1.0":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.1.1.tgz#54e8617c15185010d608c0325ecaec8d1574d12b"
-  integrity sha512-dYPY3aXtNwPrg2aEmFeWddMdohus/Ha17XES2QH+WMCawt+hH+uq28jH1EmW1RUOOzxVcdY36lRGOwqRtAJbhA==
-  dependencies:
-    "@babel/runtime" "^7.17.9"
-
 "@matrix-org/react-sdk-module-api@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.2.0.tgz#cb284601a82448dc23fac31949c466eb34ec64b4"
@@ -1685,6 +1678,13 @@
   dependencies:
     "@babel/runtime" "^7.17.9"
 
+"@matrix-org/react-sdk-module-api@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.2.1.tgz#308bcb42a780200d3e7994235376784b51819379"
+  integrity sha512-+MXTMEapzGmhArUt86GYDQirOvm19+wvQLDApmHpUQvSZvYm7wOo1EwR9FFvSKve53fu+v6gI1grnj7YLzGQ9Q==
+  dependencies:
+    "@babel/runtime" "^7.17.9"
+
 "@matrix-org/spec@^1.7.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@matrix-org/spec/-/spec-1.8.0.tgz#5d46f0ddcdff01934a63aa1f070f0ce960326acc"