Merge pull request #6 from Half-Shot/hs/add-fork-information

Add element fork information

.gitlab-ci.yml

@@ -19,10 +19,28 @@ build amd64:
   - docker rmi $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-amd64
   after_script:
   - |
-    if [ "$CI_COMMIT_BRANCH" = "master" ]; then
-      apk add --update curl
+    if [[ "$CI_COMMIT_BRANCH" == "master" && "$CI_JOB_STATUS" == "success" ]]; then
+      apk add --update curl jq
       rm -rf /var/cache/apk/*
-      curl "$NOVA_ADMIN_API_URL" -H "Content-Type: application/json" -d '{"password":"'"$NOVA_ADMIN_NIGHTLY_PASS"'","bridge":"'$NOVA_BRIDGE_TYPE'","image":"'$CI_REGISTRY_IMAGE':'$CI_COMMIT_SHA'-amd64"}'
+
+      jq -n '
+         {
+           password:  env.BEEPER_DEV_ADMIN_NIGHTLY_PASS,
+           bridge:    env.BEEPER_BRIDGE_TYPE,
+           image:     "\(env.CI_REGISTRY_IMAGE):\(env.CI_COMMIT_SHA)-amd64",
+           channel:   "STABLE"
+         }
+        ' | curl "$BEEPER_DEV_ADMIN_API_URL" -H "Content-Type: application/json" -d @-
+
+      jq -n '
+         {
+           password:    env.BEEPER_PROD_ADMIN_NIGHTLY_PASS,
+           bridge:      env.BEEPER_BRIDGE_TYPE,
+           image:       "\(env.CI_REGISTRY_IMAGE):\(env.CI_COMMIT_SHA)-amd64",
+           channel:     "INTERNAL",
+           deployNext:  true
+         }
+         ' | curl "$BEEPER_PROD_ADMIN_API_URL" -H "Content-Type: application/json" -d @-
     fi
 
 build arm64:

README.md

@@ -1,11 +1,23 @@
+## Element fork
+
+The Element fork includes the following changes:
+ - Add config limits for portal rooms https://github.com/mautrix/telegram/pull/469
+ - Make max_initial_member_sync work for Chats as well as Channels https://github.com/mautrix/telegram/pull/680
+
+Some changes that appear here may get upstreamed to https://github.com/mautrix/telegram, and will be removed from
+the list when they appear in both versions.
+
+Tagged versions will appear as `v{UPSTREAM-VERSION}-mod-{VERSION}`
+
+E.g. The third modification release to 1.0 of the upstream bridge would be `v1.0-mod-3`.
+
 # mautrix-telegram
 ![Languages](https://img.shields.io/github/languages/top/mautrix/telegram.svg)
 [![License](https://img.shields.io/github/license/mautrix/telegram.svg)](LICENSE)
 [![Release](https://img.shields.io/github/release/mautrix/telegram/all.svg)](https://github.com/mautrix/telegram/releases)
 [![GitLab CI](https://mau.dev/mautrix/telegram/badges/master/pipeline.svg)](https://mau.dev/mautrix/telegram/container_registry)
 
 A Matrix-Telegram hybrid puppeting/relaybot bridge.
-
 ## Sponsors
 * [Joel Lehtonen / Zouppen](https://github.com/zouppen)