morgan pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: 8ed4f7ac by Nicolas Vigier at 2025-01-29T13:24:56+01:00 Update rbm for rbm#40079 (make `fetch: if_needed` fetch existing branches)

- - - - - c928d6ef by Nicolas Vigier at 2025-01-29T13:42:07+01:00 Bug 41281: Remove `fetch: 1` from nightly target

With rbm#40079, when we have `fetch: if_needed` (the default), rbm will now do a fetch when `git_hash` is pointing to a branch. The reason for setting `fetch: 1` in the nightly target was that we are using some git branches, which were not fetched automatically with `fetch: if_needed`.

- - - - -

3 changed files:

- rbm - rbm.conf - rbm.local.conf.example

Changes:

===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit c6a40950607fa73861f81185764dff2bab150010 +Subproject commit 8c773150bc10133f3903841c233458dc07456d2e

===================================== rbm.conf ===================================== @@ -252,7 +252,6 @@ targets: alpha: 1 channel: alpha nightly: - fetch: 1 var: nightly: 1 channel: nightly

===================================== rbm.local.conf.example ===================================== @@ -114,15 +114,14 @@ targets:

nightly:

- ### By default 'fetch' is set to 1 for nightly builds, meaning that new - ### commits will be fetched automatically during each build. You can - ### disable this during development if you want to do rebuilds to test - ### a specific change, but don't want rebuilds caused by unrelated - ### changes, or if you want to decide at which point new commits are - ### fetched. When 'fetch' is set to 'if_needed', new commits will only - ### be fetched if the selected commit (or branch, or tag) is not present, - ### which means that existing branches won't be updated. In that case - ### you can fetch new commits by running 'make fetch'. - #fetch: 'if_needed' + ### By default 'fetch' is set to 'if_needed', meaning that new + ### commits will be fetched automatically during each build, if + ### the selected commit (or branch, or tag) is not present, or if + ### it is pointing to a branch. With the nightly target, some projects + ### are pointing to a branch, meaning they will be fetched for each + ### build. If you want to disable automatic fetchs and decide at + ### which point new commits are fetched, you can set 'fetch' to '0' + ### and run `make fetch` when you want to fetch new commits. + #fetch: 0

# vim: filetype=yaml sw=2

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/6...