1.154.0 by Codex (merged)

.github/workflows/beeper-ci.yaml

@@ -0,0 +1,141 @@
+name: Beep
+
+on:
+  push:
+    branches: ["beeper", "beeper-*"]
+  pull_request:
+
+
+jobs:
+  lint-style:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.13"
+      - run: pip install poetry
+      - run: poetry install
+      - run: poetry run ruff check --output-format=github .
+
+  lint-types:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.13"
+      - run: pip install poetry
+      - run: poetry install --extras all
+      - run: poetry run mypy
+
+  # Tests
+
+  test-trial:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.13"
+      - run: pip install poetry
+      - run: poetry install --extras all
+      - run: poetry run trial -j4 tests
+
+  test-sytest:
+    runs-on: ubuntu-latest
+    container:
+      image: matrixdotorg/sytest-synapse:bookworm
+      volumes:
+        - ${{ github.workspace }}:/src
+      env:
+        SYTEST_BRANCH: e9982eeedd352daaad1e24a067477070b6b5b0b7
+        TOP: ${{ github.workspace }}
+        POSTGRES: 1
+        MULTI_POSTGRES: 1
+        WOKRERS: 1
+    steps:
+      - uses: actions/checkout@v6
+      - name: Run SyTest
+        run: /bootstrap.sh synapse
+        working-directory: /src
+      - name: Summarise results.tap
+        if: ${{ always() }}
+        run: /sytest/scripts/tap_to_gha.pl /logs/results.tap
+      - name: Upload SyTest logs
+        uses: actions/upload-artifact@v7
+        if: ${{ always() }}
+        with:
+          name: Sytest Logs - ${{ job.status }} - (${{ join(matrix.*, ', ') }})
+          path: |
+            /logs/results.tap
+            /logs/**/*.log*
+
+  test-complement:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/checkout@v6
+        with:
+          repository: matrix-org/complement
+          path: complement
+          ref: bc2b638b11f5b0a068e39ae51f7ac2782070d14f
+      - name: Install complement dependencies
+        run: |-
+          sudo apt-get -qq update
+          sudo apt-get install -qqy libolm3 libolm-dev
+          go install -v github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
+          pip install poetry
+          poetry install
+      - name: Run Complement
+        run: ./scripts-dev/complement.sh
+        env:
+          COMPLEMENT_DIR: complement
+
+  # Builds
+
+  build-python:
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_BUILDKIT: 1
+    steps:
+      - uses: actions/checkout@v6
+      - uses: docker/setup-qemu-action@v4
+      - uses: docker/setup-buildx-action@v4
+      - uses: docker/login-action@v4
+        with:
+          registry: ${{ secrets.CI_REGISTRY }}
+          username: ${{ secrets.CI_REGISTRY_USER }}
+          password: ${{ secrets.CI_REGISTRY_PASSWORD }}
+      - run: |-
+          if [ "${{ github.ref_name }}" = "beeper" ]; then
+            tag=$(cat pyproject.toml | grep -E "^version =" | sed -E 's/^version = "(.+)"$/\1/')
+          else
+            tag="${{ github.head_ref || github.ref_name }}"
+          fi
+
+          docker buildx build \
+            --push \
+            --platform linux/amd64 \
+            --tag ${{ secrets.CI_REGISTRY }}/synapse:$tag-${{ github.sha }} \
+            -f docker/Dockerfile \
+            .
+
+          if [ "${{ github.ref_name }}" = "beeper" ]; then
+            docker pull ${{ secrets.CI_REGISTRY }}/synapse:$tag-${{ github.sha }}
+            docker tag \
+              ${{ secrets.CI_REGISTRY }}/synapse:$tag-${{ github.sha }} \
+              ${{ secrets.CI_REGISTRY }}/synapse:latest
+            docker push ${{ secrets.CI_REGISTRY }}/synapse:latest
+          fi
+
+          # Ensure the image works properly
+          docker run \
+            --entrypoint '' \
+            ${{ secrets.CI_REGISTRY }}/synapse:$tag-${{ github.sha }} \
+            python -m synapse.app.homeserver --help
+
+          echo "Pushed image: synapse:$tag-${{ github.sha }}"
+          if [ "${{ github.ref_name }}" = "beeper" ]; then
+            echo "Pushed image: synapse:latest"
+          fi

README.md

@@ -0,0 +1,67 @@
+# Synapse: Beeper Edition
+
+This is Beeper's custom version of synapse, we rebase roughly 25 commits on top of each upstream release with a few Beeper specific modifications. We also have an actual Synapse fork here: [**beeper/synapse-fork**](https://github.com/beeper/synapse-fork) which is where we make changes we expect to merge into upstream.
+
+## Branching strategy
+
+We have a bunch of branches. The main development branch for Beeper is
+the `beeper` branch. Push commits here and they get built for our
+Docker registry. The GitHub Actions logs include the specific image
+tag, which is based on the original upstream version as well as the
+commit hash.
+
+We also have versioned `beeper-x.y.z` branches. These are used to
+archive the history of the `beeper` branch as it is rebased onto newer
+upstream Synapse versions. When rebasing, we copy the current `beeper`
+branch back onto the old `beeper-x.y.z` branch for historical
+reference, then create a new `beeper-x.y.z` branch based on the new
+upstream version and rebase the `beeper` branch onto it, then
+force-push that resulting commit into the original `beeper` branch,
+which will become the new development target.
+
+We also have `upstream-x.y.z` branches that just track the upstream
+tags that we use as bases for Beeper changes, see the rebase flow
+below.
+
+## CI setup
+
+Note that we have a separate `beeper-ci.yml` GitHub Actions workflow.
+It runs exclusively on the `beeper*` branches, in place of the other
+CI workflows that upstream uses and that we have not removed from our
+fork. Don't get confused between the two.
+
+## Rebase flow
+
+### Create PR
+
+Here we're upgrading to `v1.96.1`:
+
+```
+# Make a new branch from the upstream release, we do this so we can create a PR
+# of Beeper -> upstream to run tests/confirm we're happy.
+git checkout -f v1.96.1
+git checkout -b upstream-1.96.1
+git push -u beeper upstream-1.96.1
+
+# Check out the base branch, pull any changes
+git checkout beeper
+git pull
+
+# Now create a new branch to rebase
+git checkout -b beeper-1.96.1
+# And do the rebase
+git rebase v1.96.1
+# fix any conflicts...
+
+# Push and make a PR from this branch to the upstream one created above
+git push -u beeper beeper-1.96.1
+```
+
+### Make release
+
+Once it's ready we just overwrite the `beeper` branch with the new one:
+
+```
+git checkout beeper-1.96.1
+git push --force beeper beeper
+```

beeper/complete_release.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+source $(realpath $(dirname $0))/utils.sh
+
+BEEPER_REMOTE=$(get_beeper_remote)
+
+VERSION=${1:-}
+
+if [ -z "$VERSION" ]; then
+    echo >&2 "Must specify version!"
+    exit 1
+fi
+
+echo "Completing Synapse: Beeper Edition version $VERSION"
+echo "WARNING: this script will DELETE the branch called: beeper"
+read -p "Press enter to continue"
+
+UPSTREAM_BRANCH=upstream-$VERSION
+BEEPER_BRANCH=beeper-$VERSION
+
+git checkout $BEEPER_BRANCH
+git branch -D beeper
+git checkout -b beeper
+git push --force $BEEPER_REMOTE beeper
+
+# Cleanup
+git branch -D $BEEPER_BRANCH
+git push $BEEPER_REMOTE --delete $BEEPER_BRANCH
+git branch -D $UPSTREAM_BRANCH
+git push $BEEPER_REMOTE --delete $UPSTREAM_BRANCH

beeper/prepare_release.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+source $(realpath $(dirname $0))/utils.sh
+
+BEEPER_REMOTE=$(get_beeper_remote)
+
+VERSION=${1:-}
+
+if [ -z "$VERSION" ]; then
+    echo >&2 "Must specify version!"
+    exit 1
+fi
+
+STARTING_BRANCH=$(git branch --show-current)
+
+echo "Preparing Synapse: Beeper Edition version $VERSION"
+echo "WARNING: this script will rebase on top of the CURRENT BRANCH: $STARTING_BRANCH"
+read -p "Press enter to continue"
+
+TAG=v$VERSION
+UPSTREAM_BRANCH=upstream-$VERSION
+BEEPER_BRANCH=beeper-$VERSION
+
+# Checkout the tag, create upstream branch, push it
+echo "Setup branch $UPSTREAM_BRANCH"
+git checkout -f $TAG
+git checkout -b $UPSTREAM_BRANCH
+git push -u $BEEPER_REMOTE $UPSTREAM_BRANCH
+
+# Switch back to our starting branch, create new version branch from it
+echo "Setup branch $BEEPER_BRANCH"
+git checkout $STARTING_BRANCH
+git checkout -b $BEEPER_BRANCH
+
+# And rebase against upstream, applying only our Beeper commits
+echo "Initiate rebase..."
+git rebase $UPSTREAM_BRANCH || read -p "Rebase was a mess, press enter once you fix it"
+
+git push -u $BEEPER_REMOTE $BEEPER_BRANCH
+
+echo "OK we done!"
+echo "Go HERE and make the PR: https://github.com/beeper/synapse/compare/upstream-$VERSION...beeper-$VERSION?expand=1"