Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Revert "Switch to updating presence via /sync calls instead of PUT /presence" #11365

Merged
merged 1 commit into from
Aug 3, 2023

Conversation

andybalaam
Copy link
Contributor

@andybalaam andybalaam commented Aug 3, 2023

This reverts commit 7e57394. Original PR: #11223

Reverting because we need to wait for a fix for matrix-org/synapse#16039 first.


This change is marked as an internal change (Task), so will not be included in the changelog.

@andybalaam andybalaam added the T-Task Refactoring, enabling or disabling functionality, other engineering tasks label Aug 3, 2023
@andybalaam andybalaam marked this pull request as ready for review August 3, 2023 15:56
@andybalaam andybalaam requested a review from a team as a code owner August 3, 2023 15:56
@andybalaam andybalaam self-assigned this Aug 3, 2023
@andybalaam andybalaam added the backport staging Label to automatically backport PR to staging branch label Aug 3, 2023
@andybalaam andybalaam merged commit bbab65a into develop Aug 3, 2023
33 of 34 checks passed
@andybalaam andybalaam deleted the andybalaam/revert-to-presence-api branch August 3, 2023 16:14
@RiotRobot
Copy link
Contributor

The backport to staging failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-staging staging
# Navigate to the new working tree
cd .worktrees/backport-staging
# Create a new branch
git switch --create backport-11365-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 bbab65a4cdcc51b65a6def388cf46b682e4914cc
# Push it to GitHub
git push --set-upstream origin backport-11365-to-staging
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-staging

Then, create a pull request where the base branch is staging and the compare/head branch is backport-11365-to-staging.

andybalaam added a commit that referenced this pull request Aug 3, 2023
…ce-api

Revert "Switch to updating presence via /sync calls instead of PUT /presence"

(cherry picked from commit bbab65a)
andybalaam added a commit that referenced this pull request Aug 4, 2023
Merge pull request #11365 from matrix-org/andybalaam/revert-to-presence-api
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport staging Label to automatically backport PR to staging branch T-Task Refactoring, enabling or disabling functionality, other engineering tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants