Merge tag 'v1.11.24' into sc

* Remove experimental PWA support for Firefox and Safari ([\#24630](element-hq/element-web#24630)). * Fix block code styling in rich text editor ([\#10246](matrix-org/matrix-react-sdk#10246)). Contributed by @alunturner. * Poll history: fetch more poll history ([\#10235](matrix-org/matrix-react-sdk#10235)). Contributed by @kerryarchibald. * Sort short/exact emoji matches before longer incomplete matches ([\#10212](matrix-org/matrix-react-sdk#10212)). Fixes element-hq/element-web#23210. Contributed by @grimhilt. * Poll history: detail screen ([\#10172](matrix-org/matrix-react-sdk#10172)). Contributed by @kerryarchibald. * Provide a more detailed error message than "No known servers" ([\#6048](matrix-org/matrix-react-sdk#6048)). Fixes element-hq/element-web#13247. Contributed by @aaronraimist. * Say when a call was answered from a different device ([\#10224](matrix-org/matrix-react-sdk#10224)). * Widget permissions customizations using module api ([\#10121](matrix-org/matrix-react-sdk#10121)). Contributed by @maheichyk. * Fix copy button icon overlapping with copyable text ([\#10227](matrix-org/matrix-react-sdk#10227)). Contributed by @Adesh-Pandey. * Support joining non-peekable rooms via the module API ([\#10154](matrix-org/matrix-react-sdk#10154)). Contributed by @maheichyk. * The "new login" toast does now display the same device information as in the settings. "No" does now open the device settings. "Yes, it was me" dismisses the toast. ([\#10200](matrix-org/matrix-react-sdk#10200)). * Do not prompt for a password when doing a „reset all“ after login ([\#10208](matrix-org/matrix-react-sdk#10208)). * Display "The sender has blocked you from receiving this message" error message instead of "Unable to decrypt message" ([\#10202](matrix-org/matrix-react-sdk#10202)). Contributed by @florianduros. * Polls: show warning about undecryptable relations ([\#10179](matrix-org/matrix-react-sdk#10179)). Contributed by @kerryarchibald. * Poll history: fetch last 30 days of polls ([\#10157](matrix-org/matrix-react-sdk#10157)). Contributed by @kerryarchibald. * Poll history - ended polls list items ([\#10119](matrix-org/matrix-react-sdk#10119)). Contributed by @kerryarchibald. * Remove threads labs flag and the ability to disable threads ([\#9878](matrix-org/matrix-react-sdk#9878)). Fixes element-hq/element-web#24365. * Show a success dialog after setting up the key backup ([\#10177](matrix-org/matrix-react-sdk#10177)). Fixes element-hq/element-web#24487. * Release Sign in with QR out of labs ([\#10182](matrix-org/matrix-react-sdk#10182)). Contributed by @hughns. * Release Sign in with QR out of labs ([\#10066](matrix-org/matrix-react-sdk#10066)). Contributed by @hughns. * Hide indent button in rte ([\#10149](matrix-org/matrix-react-sdk#10149)). Contributed by @alunturner. * Add option to find own location in map views ([\#10083](matrix-org/matrix-react-sdk#10083)). * Render poll end events in timeline ([\#10027](matrix-org/matrix-react-sdk#10027)). Contributed by @kerryarchibald. * Let electron-builder correctly set StartupWMClass ([\element-hq#526](element-hq#526)). Fixes element-hq/element-web#13780. * Use the room avatar as a placeholder in calls ([\#10231](matrix-org/matrix-react-sdk#10231)). * Fix calls showing as 'connecting' after hangup ([\#10223](matrix-org/matrix-react-sdk#10223)). * Stop access token overflowing the box ([\#10069](matrix-org/matrix-react-sdk#10069)). Fixes element-hq/element-web#24023. Contributed by @sbjaj33. * Prevent multiple Jitsi calls started at the same time ([\#10183](matrix-org/matrix-react-sdk#10183)). Fixes element-hq/element-web#23009. * Make localization keys compatible with agglutinative and/or SOV type languages ([\#10159](matrix-org/matrix-react-sdk#10159)). Contributed by @luixxiul. * Add link to next file in the export ([\#10190](matrix-org/matrix-react-sdk#10190)). Fixes element-hq/element-web#20272. Contributed by @grimhilt. * Ended poll tiles: add ended the poll message ([\#10193](matrix-org/matrix-react-sdk#10193)). Fixes element-hq/element-web#24579. Contributed by @kerryarchibald. * Fix accidentally inverted condition for room ordering ([\#10178](matrix-org/matrix-react-sdk#10178)). Fixes element-hq/element-web#24527. Contributed by @justjanne. * Re-focus the composer on dialogue quit ([\#10007](matrix-org/matrix-react-sdk#10007)). Fixes element-hq/element-web#22832. Contributed by @Ashu999. * Try to resolve emails before creating a DM ([\#10164](matrix-org/matrix-react-sdk#10164)). * Disable poll response loading test ([\#10168](matrix-org/matrix-react-sdk#10168)). Contributed by @justjanne. * Fix email lookup in invite dialog ([\#10150](matrix-org/matrix-react-sdk#10150)). Fixes element-hq/element-web#23353. * Remove duplicate white space characters from translation keys ([\#10152](matrix-org/matrix-react-sdk#10152)). Contributed by @luixxiul. * Fix the caption of new sessions manager on Labs settings page for localization ([\#10143](matrix-org/matrix-react-sdk#10143)). Contributed by @luixxiul. * Prevent start another DM with a user if one already exists ([\#10127](matrix-org/matrix-react-sdk#10127)). Fixes element-hq/element-web#23138. * Remove white space characters before the horizontal ellipsis ([\#10130](matrix-org/matrix-react-sdk#10130)). Contributed by @luixxiul. * Fix Selectable Text on 'Delete All' and 'Retry All' Buttons ([\#10128](matrix-org/matrix-react-sdk#10128)). Fixes element-hq/element-web#23232. Contributed by @akshattchhabra. * Correctly Identify emoticons ([\#10108](matrix-org/matrix-react-sdk#10108)). Fixes element-hq/element-web#19472. Contributed by @adarsh-sgh. * Remove a redundant white space ([\#10129](matrix-org/matrix-react-sdk#10129)). Contributed by @luixxiul.
SchildiChat · Mar 5, 2023 · d615473 · d615473
2 parents 79d4c70 + 75e3ea6
commit d615473
Show file tree

Hide file tree

Showing 12 changed files with 1,523 additions and 1,318 deletions.
diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml
@@ -19,6 +19,11 @@ on:
         required: true
         type: boolean
         default: true
+      linux:
+        description: Whether to build Linux
+        required: true
+        type: boolean
+        default: true
       deploy:
         description: Whether to deploy artifacts
         required: true
@@ -54,6 +59,17 @@ jobs:
       base-url: https://packages.element.io/${{ inputs.mode == 'release' && 'desktop' || 'nightly' }}
       version: ${{ needs.prepare.outputs.macos-version }}
 
+  linux:
+    if: github.event_name != 'workflow_dispatch' || inputs.linux
+    needs: prepare
+    name: Linux
+    uses: ./.github/workflows/build_linux.yaml
+    secrets: inherit
+    with:
+      sqlcipher: system
+      deploy-mode: true
+      version: ${{ needs.prepare.outputs.linux-version }}
+
   deploy:
     needs:
       - macos
@@ -68,8 +84,20 @@ jobs:
           name: packages.element.io
           path: packages.element.io
 
+      - name: Deploy debian repo
+        if: github.event_name != 'workflow_dispatch' || inputs.linux
+        run: |
+          mv packages.element.io/debian .
+          aws s3 cp --recursive debian/ s3://$R2_BUCKET/debian --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 }}
+          R2_URL: ${{ secrets.CF_R2_S3_API }}
+
       - name: Deploy artifacts
-        run: aws s3 cp --recursive packages.element.io/ s3://$R2_BUCKET/$DEPLOYMENT_DIR --endpoint-url $R2_URL --region auto
+        if: github.event_name != 'workflow_dispatch' || inputs.macos
+        run: |
+          aws s3 cp --recursive packages.element.io/ s3://$R2_BUCKET/$DEPLOYMENT_DIR --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 }}

diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml
@@ -3,14 +3,34 @@
 # the correct cache scoping, and additional care must be taken to not run untrusted actions on the develop branch.
 on:
     workflow_call:
+        secrets:
+            GPG_PRIVATE_KEY:
+                required: false
+            GPG_PASSPHRASE:
+                required: false
+            CF_R2_ACCESS_KEY_ID:
+                required: false
+            CF_R2_TOKEN:
+                required: false
+            CF_R2_S3_API:
+                required: false
         inputs:
+            version:
+                type: string
+                required: false
+                description: "Version string to override the one in package.json, used for non-release builds"
             sqlcipher:
                 type: string
                 required: true
                 description: "How to link sqlcipher, one of 'system' | 'static'"
+            deploy-mode:
+                type: string
+                required: false
+                description: "Whether to arrange artifacts in the arrangement needed for deployment, skipping unrelated ones, this uses reprepro and requires 'packages.element.io' environment"
 jobs:
     build:
         runs-on: ubuntu-latest
+        environment: ${{ inputs.deploy-mode && 'packages.element.io' || '' }}
         steps:
             - uses: actions/checkout@v3
 
@@ -50,15 +70,59 @@ jobs:
               env:
                   SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
 
+            - name: '[Nightly] Resolve version'
+              id: nightly
+              if: inputs.version != ''
+              run: |
+                  echo "config-args=--nightly '${{ inputs.version }}'" >> $GITHUB_OUTPUT
+
+            - name: Generate debian control file
+              run: |
+                  cp element.io/${{ inputs.version && 'nightly' || 'release' }}/control.template debcontrol
+                  INPUT_VERSION="${{ inputs.version }}"
+                  VERSION=${INPUT_VERSION:-$(cat package.json | jq -r .version)}
+                  echo "Version: $VERSION" >> debcontrol
+
             - name: Build App
-              run: "yarn build --publish never -l"
+              run: |
+                  scripts/generate-builder-config.ts ${{ steps.nightly.outputs.config-args }} --deb-custom-control=debcontrol
+                  yarn build --publish never -l --config electron-builder.json
 
-            - name: Install .deb
-              run: "sudo apt install ./dist/*.deb"
+            - name: Load GPG key
+              if: inputs.deploy-mode
+              uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 # v5
+              with:
+                  gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+                  passphrase: ${{ secrets.GPG_PASSPHRASE }}
+                  fingerprint: 75741890063E5E9A46135D01C2850B265AC085BD
+
+            - name: Prepare artifacts for deployment (reprepro)
+              if: inputs.deploy-mode
+              run: |
+                  # Clear out the template packages.element.io directory, it has a dedicated deploy workflow
+                  rm -R packages.element.io/*
+                  
+                  # Install reprepro
+                  sudo apt-get install -y reprepro
+                  
+                  # Fetch reprepro database
+                  aws s3 cp --recursive s3://$R2_BUCKET debian/db/ --endpoint-url $R2_URL --region auto
+                  
+                  grep Codename debian/conf/distributions | sed -n 's/Codename: //p' | while read -r target ; do
+                      reprepro -b debian includedeb "$target" ./dist/*.deb
+                  done
+                  
+                  # Store reprepro database
+                  aws s3 cp --recursive debian/db/ s3://$R2_BUCKET --endpoint-url $R2_URL --region auto
+              env:
+                  R2_BUCKET: packages-element-io-db
+                  AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+                  AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
+                  R2_URL: ${{ secrets.CF_R2_S3_API }}
 
             - name: Upload Artifacts
               uses: actions/upload-artifact@v3
               with:
-                  name: linux-sqlcipher-${{ inputs.sqlcipher }}
-                  path: dist
+                  name: ${{ inputs.deploy-mode && 'packages.element.io' || format('linux-sqlcipher-{0}', inputs.sqlcipher) }}
+                  path: ${{ inputs.deploy-mode && 'packages.element.io' || 'dist' }}
                   retention-days: 1
diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml
@@ -135,8 +135,8 @@ jobs:
             - name: '[Release] Prepare release latest symlink'
               if: inputs.deploy-mode && inputs.version == ''
               run: |
-                  LATEST=$(find dist -type f -iname "*.dmg" | xargs -0 -n1 -- basename)
-                  ln -s "dist/install/macos/$LATEST" dist/install/macos/Element.dmg
+                  ln -s "$(find . -type f -iname "*.dmg" | xargs -0 -n1 -- basename)" "Element.dmg"
+              working-directory: "dist/install/macos"
 
             - name: Upload Artifacts
               uses: actions/upload-artifact@v3

diff --git a/.github/workflows/build_prepare.yaml b/.github/workflows/build_prepare.yaml
@@ -28,13 +28,17 @@ on:
             macos-version:
                 description: "The version string the next macOS Nightly should use, only output for calculate-nightly-versions"
                 value: ${{ jobs.prepare.outputs.macos-version }}
+            linux-version:
+                description: "The version string the next Linux Nightly should use, only output for calculate-nightly-versions"
+                value: ${{ jobs.prepare.outputs.linux-version }}
 jobs:
     prepare:
         name: Prepare
         environment: ${{ inputs.calculate-nightly-versions && 'packages.element.io' || '' }}
         runs-on: ubuntu-latest
         outputs:
-            macos-version: ${{ steps.macos.outputs.version }}
+            macos-version: ${{ steps.versions.outputs.macos }}
+            linux-version: ${{ steps.versions.outputs.linux }}
         steps:
             - uses: actions/checkout@v3
 
@@ -64,13 +68,18 @@ jobs:
                       electronVersion
                       hakDependencies.json
 
-            - name: Calculate macOS Nightly version
-              id: macos
+            - name: Calculate Nightly versions
+              id: versions
               if: inputs.calculate-nightly-versions
               run: |
-                  LATEST=$(aws s3 cp s3://$R2_BUCKET/nightly/update/macos/releases.json - --endpoint-url $R2_URL --region auto | jq -r .currentRelease)
-                  echo "version=$(scripts/generate-nightly-version.ts --latest $LATEST)" >> $GITHUB_OUTPUT
+                  MACOS=$(aws s3 cp s3://$R2_BUCKET/nightly/update/macos/releases.json - --endpoint-url $R2_URL --region auto | jq -r .currentRelease)
+                  echo "macos=$(scripts/generate-nightly-version.ts --latest $MACOS)" >> $GITHUB_OUTPUT
+
+                  LINUX=$(aws s3 cp s3://$R2_BUCKET/debian/dists/default/main/binary-amd64/Packages - --endpoint-url $R2_URL --region auto | grep "Package: element-nightly" -A 50 | grep Version -m1 | sed -n 's/Version: //p')
+                  echo "linux=$(scripts/generate-nightly-version.ts --latest $LINUX)" >> $GITHUB_OUTPUT
               env:
                   AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
+                  # XXX: UPDATE THIS BEFORE WHEN GOING LIVE
+                  R2_BUCKET: 'packages-element-io-test'
                   R2_URL: ${{ secrets.CF_R2_S3_API }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,53 @@
+Changes in [1.11.24](https://github.com/vector-im/element-desktop/releases/tag/v1.11.24) (2023-02-28)
+=====================================================================================================
+
+## ✨ Features
+ * Remove experimental PWA support for Firefox and Safari ([\#24630](https://github.com/vector-im/element-web/pull/24630)).
+ * Fix block code styling in rich text editor ([\#10246](https://github.com/matrix-org/matrix-react-sdk/pull/10246)). Contributed by @alunturner.
+ * Poll history: fetch more poll history ([\#10235](https://github.com/matrix-org/matrix-react-sdk/pull/10235)). Contributed by @kerryarchibald.
+ * Sort short/exact emoji matches before longer incomplete matches ([\#10212](https://github.com/matrix-org/matrix-react-sdk/pull/10212)). Fixes vector-im/element-web#23210. Contributed by @grimhilt.
+ * Poll history: detail screen ([\#10172](https://github.com/matrix-org/matrix-react-sdk/pull/10172)). Contributed by @kerryarchibald.
+ * Provide a more detailed error message than "No known servers" ([\#6048](https://github.com/matrix-org/matrix-react-sdk/pull/6048)). Fixes vector-im/element-web#13247. Contributed by @aaronraimist.
+ * Say when a call was answered from a different device ([\#10224](https://github.com/matrix-org/matrix-react-sdk/pull/10224)).
+ * Widget permissions customizations using module api ([\#10121](https://github.com/matrix-org/matrix-react-sdk/pull/10121)). Contributed by @maheichyk.
+ * Fix copy button icon overlapping with copyable text ([\#10227](https://github.com/matrix-org/matrix-react-sdk/pull/10227)). Contributed by @Adesh-Pandey.
+ * Support joining non-peekable rooms via the module API ([\#10154](https://github.com/matrix-org/matrix-react-sdk/pull/10154)). Contributed by @maheichyk.
+ * The "new login" toast does now display the same device information as in the settings. "No" does now open the device settings. "Yes, it was me" dismisses the toast. ([\#10200](https://github.com/matrix-org/matrix-react-sdk/pull/10200)).
+ * Do not prompt for a password when doing a „reset all“ after login ([\#10208](https://github.com/matrix-org/matrix-react-sdk/pull/10208)).
+ * Display "The sender has blocked you from receiving this message" error message instead of "Unable to decrypt message" ([\#10202](https://github.com/matrix-org/matrix-react-sdk/pull/10202)). Contributed by @florianduros.
+ * Polls: show warning about undecryptable relations ([\#10179](https://github.com/matrix-org/matrix-react-sdk/pull/10179)). Contributed by @kerryarchibald.
+ * Poll history: fetch last 30 days of polls ([\#10157](https://github.com/matrix-org/matrix-react-sdk/pull/10157)). Contributed by @kerryarchibald.
+ * Poll history - ended polls list items ([\#10119](https://github.com/matrix-org/matrix-react-sdk/pull/10119)). Contributed by @kerryarchibald.
+ * Remove threads labs flag and the ability to disable threads ([\#9878](https://github.com/matrix-org/matrix-react-sdk/pull/9878)). Fixes vector-im/element-web#24365.
+ * Show a success dialog after setting up the key backup ([\#10177](https://github.com/matrix-org/matrix-react-sdk/pull/10177)). Fixes vector-im/element-web#24487.
+ * Release Sign in with QR out of labs ([\#10182](https://github.com/matrix-org/matrix-react-sdk/pull/10182)). Contributed by @hughns.
+ * Release Sign in with QR out of labs ([\#10066](https://github.com/matrix-org/matrix-react-sdk/pull/10066)). Contributed by @hughns.
+ * Hide indent button in rte ([\#10149](https://github.com/matrix-org/matrix-react-sdk/pull/10149)). Contributed by @alunturner.
+ * Add option to find own location in map views ([\#10083](https://github.com/matrix-org/matrix-react-sdk/pull/10083)).
+ * Render poll end events in timeline ([\#10027](https://github.com/matrix-org/matrix-react-sdk/pull/10027)). Contributed by @kerryarchibald.
+
+## 🐛 Bug Fixes
+ * Let electron-builder correctly set StartupWMClass ([\#526](https://github.com/vector-im/element-desktop/pull/526)). Fixes vector-im/element-web#13780.
+ * Use the room avatar as a placeholder in calls ([\#10231](https://github.com/matrix-org/matrix-react-sdk/pull/10231)).
+ * Fix calls showing as 'connecting' after hangup ([\#10223](https://github.com/matrix-org/matrix-react-sdk/pull/10223)).
+ * Stop access token overflowing the box ([\#10069](https://github.com/matrix-org/matrix-react-sdk/pull/10069)). Fixes vector-im/element-web#24023. Contributed by @sbjaj33.
+ * Prevent multiple Jitsi calls started at the same time ([\#10183](https://github.com/matrix-org/matrix-react-sdk/pull/10183)). Fixes vector-im/element-web#23009.
+ * Make localization keys compatible with agglutinative and/or SOV type languages ([\#10159](https://github.com/matrix-org/matrix-react-sdk/pull/10159)). Contributed by @luixxiul.
+ * Add link to next file in the export ([\#10190](https://github.com/matrix-org/matrix-react-sdk/pull/10190)). Fixes vector-im/element-web#20272. Contributed by @grimhilt.
+ * Ended poll tiles: add ended the poll message ([\#10193](https://github.com/matrix-org/matrix-react-sdk/pull/10193)). Fixes vector-im/element-web#24579. Contributed by @kerryarchibald.
+ * Fix accidentally inverted condition for room ordering ([\#10178](https://github.com/matrix-org/matrix-react-sdk/pull/10178)). Fixes vector-im/element-web#24527. Contributed by @justjanne.
+ * Re-focus the composer on dialogue quit ([\#10007](https://github.com/matrix-org/matrix-react-sdk/pull/10007)). Fixes vector-im/element-web#22832. Contributed by @Ashu999.
+ * Try to resolve emails before creating a DM ([\#10164](https://github.com/matrix-org/matrix-react-sdk/pull/10164)).
+ * Disable poll response loading test ([\#10168](https://github.com/matrix-org/matrix-react-sdk/pull/10168)). Contributed by @justjanne.
+ * Fix email lookup in invite dialog ([\#10150](https://github.com/matrix-org/matrix-react-sdk/pull/10150)). Fixes vector-im/element-web#23353.
+ * Remove duplicate white space characters from translation keys ([\#10152](https://github.com/matrix-org/matrix-react-sdk/pull/10152)). Contributed by @luixxiul.
+ * Fix the caption of new sessions manager on Labs settings page for localization ([\#10143](https://github.com/matrix-org/matrix-react-sdk/pull/10143)). Contributed by @luixxiul.
+ * Prevent start another DM with a user if one already exists ([\#10127](https://github.com/matrix-org/matrix-react-sdk/pull/10127)). Fixes vector-im/element-web#23138.
+ * Remove white space characters before the horizontal ellipsis ([\#10130](https://github.com/matrix-org/matrix-react-sdk/pull/10130)). Contributed by @luixxiul.
+ * Fix Selectable Text on 'Delete All' and 'Retry All' Buttons ([\#10128](https://github.com/matrix-org/matrix-react-sdk/pull/10128)). Fixes vector-im/element-web#23232. Contributed by @akshattchhabra.
+ * Correctly Identify emoticons ([\#10108](https://github.com/matrix-org/matrix-react-sdk/pull/10108)). Fixes vector-im/element-web#19472. Contributed by @adarsh-sgh.
+ * Remove a redundant white space ([\#10129](https://github.com/matrix-org/matrix-react-sdk/pull/10129)). Contributed by @luixxiul.
+
 Changes in [1.11.23](https://github.com/vector-im/element-desktop/releases/tag/v1.11.23) (2023-02-14)
 =====================================================================================================
 

diff --git a/debian/conf/distributions b/debian/conf/distributions
@@ -0,0 +1,52 @@
+Origin: riot.im
+Codename: default
+Architectures: amd64 i386 source
+Components: main
+SignWith: D7B0B66941D01538
+Tracking: minimal
+
+Origin: riot.im
+Suite: oldoldstable
+Codename: jessie
+Architectures: amd64 i386 source
+Components: main
+SignWith: D7B0B66941D01538
+Tracking: minimal
+
+Origin: riot.im
+Suite: oldstable
+Codename: stretch
+Architectures: amd64 i386 source
+Components: main
+SignWith: D7B0B66941D01538
+Tracking: minimal
+
+Origin: riot.im
+Suite: testing
+Codename: bullseye
+Architectures: amd64 i386 source
+Components: main
+SignWith: D7B0B66941D01538
+Tracking: minimal
+
+Origin: riot.im
+Suite: unstable
+Codename: sid
+Architectures: amd64 i386 source
+Components: main
+SignWith: D7B0B66941D01538
+Tracking: minimal
+
+Origin: riot.im
+Codename: xenial
+Architectures: amd64 i386 source
+Components: main
+SignWith: D7B0B66941D01538
+Tracking: minimal
+
+Origin: riot.im
+Codename: bionic
+Architectures: amd64 i386 source
+Components: main
+SignWith: D7B0B66941D01538
+Tracking: minimal
diff --git a/debian/conf/options b/debian/conf/options
@@ -0,0 +1,5 @@
+# don't delete old debs by default
+keepunreferencedfiles
+
+# output dir
+outdir +b/../packages.element.io/debian
diff --git a/element.io/nightly/config.json b/element.io/nightly/config.json
@@ -11,7 +11,6 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
     "showLabsSettings": true,

diff --git a/element.io/release/config.json b/element.io/release/config.json
@@ -11,7 +11,6 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
     "roomDirectory": {

diff --git a/scripts/generate-nightly-version.ts b/scripts/generate-nightly-version.ts
@@ -18,24 +18,24 @@ const argv = parseArgs<{
 
 function parseVersion(version: string): [Date, number] {
     const year = parseInt(version.slice(0, 4), 10);
-    const month = parseInt(version.slice(4, 2), 10);
-    const day = parseInt(version.slice(6, 2), 10);
-    const num = parseInt(version.slice(8, 2), 10);
+    const month = parseInt(version.slice(4, 6), 10);
+    const day = parseInt(version.slice(6, 8), 10);
+    const num = parseInt(version.slice(8, 10), 10);
     return [new Date(year, month - 1, day), num];
 }
 
 const [latestDate, latestNum] = argv.latest ? parseVersion(argv.latest) : [];
 
 const now = new Date();
-const month = (now.getMonth() + 1).toString().padStart(2, '0');
-const date = now.getDate().toString().padStart(2, '0');
+const month = (now.getMonth() + 1).toString().padStart(2, "0");
+const date = now.getDate().toString().padStart(2, "0");
 let buildNum = 1;
-if (latestDate && new Date(latestDate).getDate().toString().padStart(2, '0') === date) {
+if (latestDate && new Date(latestDate).getDate().toString().padStart(2, "0") === date) {
     buildNum = latestNum! + 1;
 }
 
 if (buildNum > 99) {
     throw new Error("Maximum number of Nightlies exceeded on this day.");
 }
 
-console.log(now.getFullYear() + month + date + buildNum.toString().padStart(2, '0') + buildNum);
+console.log(now.getFullYear() + month + date + buildNum.toString().padStart(2, "0"));