From bb223eedd50e0b9c42c8b3399c6faa3fe100cd20 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Fri, 4 Aug 2023 10:23:11 +0200 Subject: [PATCH 1/4] [Backport staging] Package release builds of element-web in package.element.io debs (#25921) Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/build_debian.yaml | 56 +++++++++++++++++++++++++++++ debian/conffiles | 1 + debian/control | 12 +++++++ 3 files changed, 69 insertions(+) create mode 100644 .github/workflows/build_debian.yaml create mode 100644 debian/conffiles create mode 100755 debian/control diff --git a/.github/workflows/build_debian.yaml b/.github/workflows/build_debian.yaml new file mode 100644 index 0000000000..e75c545097 --- /dev/null +++ b/.github/workflows/build_debian.yaml @@ -0,0 +1,56 @@ +name: Build Debian package +on: + release: + types: [published] +concurrency: ${{ github.workflow }} +jobs: + build: + name: Build package + if: github.event.release.prerelease == false + environment: packages.element.io + runs-on: ubuntu-latest + env: + R2_INCOMING_BUCKET: ${{ vars.R2_INCOMING_BUCKET }} + R2_URL: ${{ vars.CF_R2_S3_API }} + steps: + - uses: actions/checkout@v3 + + - name: Prepare + run: | + mkdir debian/DEBIAN + mv debian/* debian/DEBIAN/ + mkdir -p debian/usr/share/element-web/ + + wget https://github.com/vector-im/element-web/releases/download/$VERSION/element-$VERSION.tar.gz + mv element-* debian/usr/share/element-web + mv debian/usr/share/element-web/config.sample.json debian/usr/share/element-web/config.json + env: + VERSION: ${{ github.ref_name }} + + - name: Build deb package + run: | + VERSION=$(cat package.json | jq -r .version) + chmod -R u=rw,go=r debian/usr/share/element-web/ + dpkg-deb -Zxz --root-owner-group -VVersion=$VERSION --build debian element-web.deb + + # For now just upload the artifact to github + - uses: actions/upload-artifact@v3 + with: + name: element-io-archive-keyring + path: element-io-archive-keyring.deb + retention-days: 14 + + #- name: Upload incoming deb + # run: aws s3 cp element-io-archive-keyring.deb "s3://$R2_INCOMING_BUCKET" --endpoint-url "$R2_URL" --region auto + # env: + # AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }} + # AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }} + + #reprepro: + # needs: build + # name: Run reprepro + # if: inputs.deploy && github.event.release.prerelease == false + # uses: ./.github/workflows/reprepro.yaml + # secrets: inherit + # with: + # incoming: element-web.deb diff --git a/debian/conffiles b/debian/conffiles new file mode 100644 index 0000000000..4d9b0b387e --- /dev/null +++ b/debian/conffiles @@ -0,0 +1 @@ +/usr/share/element-web/config.json diff --git a/debian/control b/debian/control new file mode 100755 index 0000000000..d8e38a7503 --- /dev/null +++ b/debian/control @@ -0,0 +1,12 @@ +Package: 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} +Description: + A feature-rich client for Matrix.org From 0b72e925d548377c10116addc74f460aec51ba48 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 4 Aug 2023 09:31:06 +0100 Subject: [PATCH 2/4] Upgrade matrix-react-sdk to 3.77.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f26fa0f67d..7fa4889a1e 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "27.1.0", - "matrix-react-sdk": "3.77.0", + "matrix-react-sdk": "3.77.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index f4124f1280..a536a365c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8441,10 +8441,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.77.0: - version "3.77.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.77.0.tgz#357eaec96b549befa79f0cfaf343c40249788d5d" - integrity sha512-Vi5oFxplzdqutz4oXcOOhJ4INwJ6LD4DX+PDD0xStmcXTAUljy/ecxzKMZfHc8WWDUSZvUFx1nJbLVLQiMv6Mw== +matrix-react-sdk@3.77.1: + version "3.77.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.77.1.tgz#80606bbc0d1b6a371faddf927bfb5e1618765a22" + integrity sha512-OLD0paQXSguPNIMZLU6PR2JlwQ+EP2SclYAkSVFWicFl9Z7i6zm3y8v3o+N6QRPV3mbjKhp6L7Jvde8LnzBkhg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.5.0" From ab7536d220ad9621d0e9f4ca2b4a22a1afbdbd9c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 4 Aug 2023 09:33:31 +0100 Subject: [PATCH 3/4] Prepare changelog for v1.11.38 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05c4551c44..350c15ba93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Changes in [1.11.38](https://github.com/vector-im/element-web/releases/tag/v1.11.38) (2023-08-04) +================================================================================================= + +## ✨ Features + * Package release builds of element-web in package.element.io debs ([\#25198](https://github.com/vector-im/element-web/pull/25198)). + +## 🐛 Bug Fixes + * Revert to using the /presence API for presence ([\#11366](https://github.com/matrix-org/matrix-react-sdk/pull/11366)) + Changes in [1.11.37](https://github.com/vector-im/element-web/releases/tag/v1.11.37) (2023-08-01) ================================================================================================= From e059524f6e940ca6d2e3bfdf0b503b0c00c87db4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 4 Aug 2023 09:33:32 +0100 Subject: [PATCH 4/4] v1.11.38 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7fa4889a1e..418ed03a43 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.37", + "version": "1.11.38", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {