Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 9c867ad5 by Cecylia Bocovich at 2026-03-31T18:18:17+02:00 Bug 41753: Add pre_go_vendor and go_vendor_patch vars Let projects define pre_go_vendor and go_vendor_patch variables for the purpose of patching vendored dependencies. - - - - - 9d1d9a64 by Cecylia Bocovich at 2026-03-31T18:18:17+02:00 Bug 41753: Keep lyrebird support for go1.22 in macos only - - - - - 4 changed files: - Makefile - projects/lyrebird/build - projects/lyrebird/config - rbm.conf Changes: ===================================== Makefile ===================================== @@ -476,6 +476,9 @@ go_vendor-conjure: submodule-update go_vendor-lyrebird: submodule-update $(rbm) build lyrebird --step go_vendor --target alpha --target torbrowser-linux-x86_64 +go_vendor-lyrebird-macos: submodule-update + $(rbm) build lyrebird --step go_vendor --target alpha --target torbrowser-macos + go_vendor-go-licenses: submodule-update $(rbm) build go-licenses --step go_vendor --target alpha --target torbrowser-linux-x86_64 ===================================== projects/lyrebird/build ===================================== @@ -18,6 +18,12 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] cd /var/tmp/build/[% project %]-[% c('version') %] +[% IF c("var/macos") -%] + if [ -e "go-1.22.patch" ]; then + patch -p1 < "go-1.22.patch" + fi +[% END -%] + tar -xf $rootdir/[% c('input_files_by_name/go_vendor') %] go build -mod=vendor -ldflags '-X main.lyrebirdVersion=[% c("version") %] -s[% IF c("var/android") %] -checklinkname=0[% END %]' ./cmd/lyrebird ===================================== projects/lyrebird/config ===================================== @@ -16,8 +16,13 @@ targets: git_hash: main version: '[% c("abbrev") %]' tag_gpg_id: 0 + macos: var: - go_vendor_sha256sum: '' + go_vendor_sha256sum: 6a054acb7793becdbcb9a08ce7781f3d331f15e85242b399fcef96fb89941f4d + pre_go_vendor: | + if [ -e "/var/tmp/build/[% project %]-[% c('version') %]/go-1.22.patch" ]; then + patch -p1 < "/var/tmp/build/[% project %]-[% c('version') %]/go-1.22.patch" + fi steps: build: @@ -33,9 +38,7 @@ steps: pkg_type: go_vendor project: lyrebird norec: - sha256sum: '[% c("var/go_vendor_sha256sum") %]' - target_replace: - '^torbrowser-(?!testbuild).*': 'torbrowser-linux-x86_64' + sha256sum: '[% IF !c("var/nightly") %][% c("var/go_vendor_sha256sum") %][% END %]' - name: go-licenses project: go-licenses target_replace: ===================================== rbm.conf ===================================== @@ -57,6 +57,7 @@ steps: mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] cd /var/tmp/build/[% project %]-[% c('version') %] + [% IF c("var/pre_go_vendor"); GET c("var/pre_go_vendor"); END -%] go mod vendor [% c('tar', { tar_src => [ 'vendor' ], View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/1... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/1... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help