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
-
9d1d9a64
by Cecylia Bocovich at 2026-03-31T18:18:17+02:00
4 changed files:
Changes:
| ... | ... | @@ -476,6 +476,9 @@ go_vendor-conjure: submodule-update |
| 476 | 476 | go_vendor-lyrebird: submodule-update
|
| 477 | 477 | $(rbm) build lyrebird --step go_vendor --target alpha --target torbrowser-linux-x86_64
|
| 478 | 478 | |
| 479 | +go_vendor-lyrebird-macos: submodule-update
|
|
| 480 | + $(rbm) build lyrebird --step go_vendor --target alpha --target torbrowser-macos
|
|
| 481 | + |
|
| 479 | 482 | go_vendor-go-licenses: submodule-update
|
| 480 | 483 | $(rbm) build go-licenses --step go_vendor --target alpha --target torbrowser-linux-x86_64
|
| 481 | 484 |
| ... | ... | @@ -18,6 +18,12 @@ mkdir -p /var/tmp/build |
| 18 | 18 | tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
|
| 19 | 19 | cd /var/tmp/build/[% project %]-[% c('version') %]
|
| 20 | 20 | |
| 21 | +[% IF c("var/macos") -%]
|
|
| 22 | + if [ -e "go-1.22.patch" ]; then
|
|
| 23 | + patch -p1 < "go-1.22.patch"
|
|
| 24 | + fi
|
|
| 25 | +[% END -%]
|
|
| 26 | + |
|
| 21 | 27 | tar -xf $rootdir/[% c('input_files_by_name/go_vendor') %]
|
| 22 | 28 | |
| 23 | 29 | go build -mod=vendor -ldflags '-X main.lyrebirdVersion=[% c("version") %] -s[% IF c("var/android") %] -checklinkname=0[% END %]' ./cmd/lyrebird
|
| ... | ... | @@ -16,8 +16,13 @@ targets: |
| 16 | 16 | git_hash: main
|
| 17 | 17 | version: '[% c("abbrev") %]'
|
| 18 | 18 | tag_gpg_id: 0
|
| 19 | + macos:
|
|
| 19 | 20 | var:
|
| 20 | - go_vendor_sha256sum: ''
|
|
| 21 | + go_vendor_sha256sum: 6a054acb7793becdbcb9a08ce7781f3d331f15e85242b399fcef96fb89941f4d
|
|
| 22 | + pre_go_vendor: |
|
|
| 23 | + if [ -e "/var/tmp/build/[% project %]-[% c('version') %]/go-1.22.patch" ]; then
|
|
| 24 | + patch -p1 < "/var/tmp/build/[% project %]-[% c('version') %]/go-1.22.patch"
|
|
| 25 | + fi
|
|
| 21 | 26 | |
| 22 | 27 | steps:
|
| 23 | 28 | build:
|
| ... | ... | @@ -33,9 +38,7 @@ steps: |
| 33 | 38 | pkg_type: go_vendor
|
| 34 | 39 | project: lyrebird
|
| 35 | 40 | norec:
|
| 36 | - sha256sum: '[% c("var/go_vendor_sha256sum") %]'
|
|
| 37 | - target_replace:
|
|
| 38 | - '^torbrowser-(?!testbuild).*': 'torbrowser-linux-x86_64'
|
|
| 41 | + sha256sum: '[% IF !c("var/nightly") %][% c("var/go_vendor_sha256sum") %][% END %]'
|
|
| 39 | 42 | - name: go-licenses
|
| 40 | 43 | project: go-licenses
|
| 41 | 44 | target_replace:
|
| ... | ... | @@ -57,6 +57,7 @@ steps: |
| 57 | 57 | mkdir -p /var/tmp/build
|
| 58 | 58 | tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
|
| 59 | 59 | cd /var/tmp/build/[% project %]-[% c('version') %]
|
| 60 | + [% IF c("var/pre_go_vendor"); GET c("var/pre_go_vendor"); END -%]
|
|
| 60 | 61 | go mod vendor
|
| 61 | 62 | [% c('tar', {
|
| 62 | 63 | tar_src => [ 'vendor' ],
|