Skip to content

Integrate Samba rsync from BCR#3265

Merged
adincebic merged 6 commits into
mainfrom
adin/integrate-rsync-from-bcr
May 6, 2026
Merged

Integrate Samba rsync from BCR#3265
adincebic merged 6 commits into
mainfrom
adin/integrate-rsync-from-bcr

Conversation

@adincebic
Copy link
Copy Markdown
Contributor

Integrating rsync from BCR to stop relying on system rsync / homebrew rsync. We allow users to rely on homebrew rsync ever since the issue with openrsync on maCOS popped up. This fixes that.

@adincebic adincebic requested review from a team as code owners January 22, 2026 11:24
@adincebic adincebic force-pushed the adin/integrate-rsync-from-bcr branch from 905287e to d47f5ab Compare January 22, 2026 11:25
Comment thread xcodeproj/internal/templates/installer.sh Outdated
Comment thread xcodeproj/internal/xcodeproj_rule.bzl Outdated
Comment thread MODULE.bazel Outdated
Comment thread xcodeproj/internal/bazel_integration_files/BUILD
@adincebic adincebic force-pushed the adin/integrate-rsync-from-bcr branch from b1398d2 to 69a75c9 Compare January 24, 2026 07:10
@timothyklim
Copy link
Copy Markdown
Contributor

This is really cool!

@adincebic adincebic force-pushed the adin/integrate-rsync-from-bcr branch from 69a75c9 to 3f237c7 Compare February 7, 2026 11:10
@adincebic
Copy link
Copy Markdown
Contributor Author

@brentleyjones can you review again? This would be good to have in the next release.

@ssaradp
Copy link
Copy Markdown

ssaradp commented Mar 11, 2026

This would be really awesome to land. Thanks again for doing this.

@brentleyjones
Copy link
Copy Markdown
Contributor

Please rebase and add it to the CHANGELOG.md.

@adincebic
Copy link
Copy Markdown
Contributor Author

Please rebase and add it to the CHANGELOG.md.

I'll deal with this today.

@adincebic adincebic force-pushed the adin/integrate-rsync-from-bcr branch from f6c6bab to 274b4e1 Compare March 19, 2026 12:04
@adincebic
Copy link
Copy Markdown
Contributor Author

@brentleyjones done.

@adincebic adincebic force-pushed the adin/integrate-rsync-from-bcr branch 2 times, most recently from 4ebaea0 to 0d45120 Compare March 25, 2026 20:05
@adincebic adincebic force-pushed the adin/integrate-rsync-from-bcr branch from 0d45120 to 887e5ef Compare April 18, 2026 05:43
@brentleyjones brentleyjones force-pushed the adin/integrate-rsync-from-bcr branch from 887e5ef to d53a731 Compare April 29, 2026 19:51
Comment thread CHANGELOG.md Outdated
@adincebic adincebic force-pushed the adin/integrate-rsync-from-bcr branch from d53a731 to d033214 Compare May 3, 2026 12:10
@brentleyjones
Copy link
Copy Markdown
Contributor

I think this failure is new to this PR?

ERROR: /Users/administrator/buildbuddy.noindex/remote_build/b50e70a6-c0e0-418c-92ac-0e9a2450e43b/repo-root/examples/integration/bazel-output-base/rules_xcodeproj.noindex/build_output_base/external/openssl+/BUILD.bazel:405:11: Compiling crypto/rsa/rsa_x931.c [for tool] failed: undeclared inclusion(s) in rule '@@openssl+//:crypto':
this rule is missing dependency declarations for the following files included by 'crypto/rsa/rsa_x931.c':
  'external/openssl+/include/openssl/opensslconf.h'
ERROR: /Users/administrator/buildbuddy.noindex/remote_build/b50e70a6-c0e0-418c-92ac-0e9a2450e43b/repo-root/examples/integration/bazel-output-base/rules_xcodeproj.noindex/build_output_base/external/rsync+/BUILD.bazel:253:10 Linking external/rsync+/rsync [for tool] failed: undeclared inclusion(s) in rule '@@openssl+//:crypto':
this rule is missing dependency declarations for the following files included by 'crypto/rsa/rsa_x931.c':
  'external/openssl+/include/openssl/opensslconf.h'

@brentleyjones
Copy link
Copy Markdown
Contributor

The failure is still there btw.

adincebic added 6 commits May 6, 2026 05:11
Signed-off-by: Adin Cebic <cebic.ad@gmail.com>
Signed-off-by: Adin Cebic <cebic.ad@gmail.com>
Signed-off-by: Adin Cebic <cebic.ad@gmail.com>
Signed-off-by: Adin Cebic <cebic.ad@gmail.com>
Signed-off-by: Adin Cebic <cebic.ad@gmail.com>
Signed-off-by: Adin Cebic <cebic.ad@gmail.com>
@adincebic adincebic force-pushed the adin/integrate-rsync-from-bcr branch from f88d1de to 0072029 Compare May 6, 2026 05:48
@adincebic adincebic enabled auto-merge (squash) May 6, 2026 06:20
@adincebic
Copy link
Copy Markdown
Contributor Author

The failure is still there btw.

I updated the rsync module which contains the relevant fix.

@adincebic adincebic merged commit 3a30bc8 into main May 6, 2026
9 checks passed
@adincebic adincebic deleted the adin/integrate-rsync-from-bcr branch May 6, 2026 11:14
@brentleyjones
Copy link
Copy Markdown
Contributor

The prebuilt tool breaks our Linux-initiated project generation. I'll open a PR soon that allows disabling the prebuilt tool for project generation.

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.

5 participants