Skip to content

Conversation

@Passw
Copy link
Contributor

@Passw Passw commented Jan 9, 2026

fd79225#diff-9ebec7cefb9a7cf3e22117154d3a39cf238118d6f25b5922bfba7f315ebc8fb6L137-R140

@csoler
You should first test your code changes locally and have them reviewed by others before merging them into the codebase. The master branch must not be repeatedly broken by your changes. At minimum, all commits must pass CI regression tests for repository at https://github.com/RetroShare/RetroShare.

@csoler
Copy link
Contributor

csoler commented Jan 9, 2026

Sorry for the inconvenience. These two PRs have been tested and online for a long time (months) but:

  • CI regression tests do not work when you do two PRs in libretrosahre and retroshare at the same time
  • some errors have been reported about compilation before merging and I fixed them (apparently not all, but I wasn't aware)
  • large changes like this one are always expected to cause some problems and generally they get fixed immediately.
    Thx for the fix btw, but the missing rschat.h doesn't break compilation. Is there anything else?

@csoler csoler merged commit a4e959d into RetroShare:master Jan 9, 2026
1 check failed
@Passw
Copy link
Contributor Author

Passw commented Jan 9, 2026

Sorry for the inconvenience. These two PRs have been tested and online for a long time (months) but:

  • CI regression tests do not work when you do two PRs in libretrosahre and retroshare at the same time

RetroShare/RetroShare#3078 (comment)

We have talked this on how to trigger the GitHub Action when we do changes to the two repositories: https://github.com/RetroShare/RetroShare and https://github.com/RetroShare/libretroshare.

  1. Make changes to RetroShare/libretroshare and RetroShare/RetroShare repositories in your personal forked branch
  2. Update RetroShare/RetroShare/.gitmodules configuration file in your personal forked branch, so that it tracks the corresponding commit of your forked RetroShare/libretroshare repository
  3. Upon passing all CI regression tests, merge the changes into the upstream repository at https://github.com/RetroShare/libretroshare.
  4. Update RetroShare/RetroShare/.gitmodules again to track the latest commit hash of the master branch in https://github.com/RetroShare/libretroshare.
  5. Merge changes RetroShare/RetroShare into master branch

Example:
RetroShare/RetroShare#3078
#217

  • some errors have been reported about compilation before merging and I fixed them (apparently not all, but I wasn't aware)
  • large changes like this one are always expected to cause some problems and generally they get fixed immediately.
    Thx for the fix btw, but the missing rschat.h doesn't break compilation. Is there anything else?

Wrong namesapce : error: no member named 'Msgs' in namespace 'Rs' and error: unknown type name 'ChatId'... #231

@Passw Passw deleted the patch-1 branch January 9, 2026 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants