[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Update rbm for rbm#40079 (make `fetch: if_needed` fetch existing branches)

Title: GitLab

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:

Changes:

  • rbm
    1 
    -Subproject commit c6a40950607fa73861f81185764dff2bab150010
    1 
    +Subproject commit 8c773150bc10133f3903841c233458dc07456d2e

  • rbm.conf
    ... ... @@ -252,7 +252,6 @@ targets:
    252 252 
           alpha: 1
    253 253 
           channel: alpha
    254 254 
       nightly:
    255 
    -    fetch: 1
    256 255 
         var:
    257 256 
           nightly: 1
    258 257 
           channel: nightly

  • rbm.local.conf.example
    ... ... @@ -114,15 +114,14 @@ targets:
    114 114
    115 115 
       nightly:
    116 116
    117 
    -    ### By default 'fetch' is set to 1 for nightly builds, meaning that new
    118 
    -    ### commits will be fetched automatically during each build. You can
    119 
    -    ### disable this during development if you want to do rebuilds to test
    120 
    -    ### a specific change, but don't want rebuilds caused by unrelated
    121 
    -    ### changes, or if you want to decide at which point new commits are
    122 
    -    ### fetched. When 'fetch' is set to 'if_needed', new commits will only
    123 
    -    ### be fetched if the selected commit (or branch, or tag) is not present,
    124 
    -    ### which means that existing branches won't be updated. In that case
    125 
    -    ### you can fetch new commits by running 'make fetch'.
    126 
    -    #fetch: 'if_needed'
    117 
    +    ### By default 'fetch' is set to 'if_needed', meaning that new
    118 
    +    ### commits will be fetched automatically during each build, if
    119 
    +    ### the selected commit (or branch, or tag) is not present, or if
    120 
    +    ### it is pointing to a branch. With the nightly target, some projects
    121 
    +    ### are pointing to a branch, meaning they will be fetched for each
    122 
    +    ### build. If you want to disable automatic fetchs and decide at
    123 
    +    ### which point new commits are fetched, you can set 'fetch' to '0'
    124 
    +    ### and run `make fetch` when you want to fetch new commits.
    125 
    +    #fetch: 0
    127 126
    128 127 
     # vim: filetype=yaml sw=2

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx