Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build

Commits:

5 changed files:

Changes:

  • projects/android-components/config
    1 1
     # vim: filetype=yaml sw=2
    
    2 2
     version: '[% c("abbrev") %]'
    
    3 3
     filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
    
    4
    -git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build5'
    
    4
    +git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build6'
    
    5 5
     git_url: https://gitlab.torproject.org/tpo/applications/android-components.git
    
    6 6
     tag_gpg_id: 1
    
    7 7
     gpg_keyring:
    

  • projects/fenix/config
    1 1
     # vim: filetype=yaml sw=2
    
    2 2
     version: '[% c("abbrev") %]'
    
    3 3
     filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz'
    
    4
    -git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build2'
    
    4
    +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build3'
    
    5 5
     git_url: https://gitlab.torproject.org/tpo/applications/fenix.git
    
    6 6
     tag_gpg_id: 1
    
    7 7
     gpg_keyring:
    

  • projects/firefox/config
    ... ... @@ -15,7 +15,7 @@ var:
    15 15
       firefox_platform_version: 102.9.0
    
    16 16
       firefox_version: '[% c("var/firefox_platform_version") %]esr'
    
    17 17
       browser_branch: '12.0-1'
    
    18
    -  browser_build: 1
    
    18
    +  browser_build: 2
    
    19 19
       branding_directory: 'browser/branding/alpha'
    
    20 20
       copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
    
    21 21
       nightly_updates_osname: '[% c("var/osname") %]'
    
    ... ... @@ -65,8 +65,7 @@ steps:
    65 65
     
    
    66 66
     targets:
    
    67 67
       basebrowser:
    
    68
    -    # basebrowser tag always has a -build1 suffix
    
    69
    -    git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build1'
    
    68
    +    git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build2'
    
    70 69
     
    
    71 70
       release:
    
    72 71
         var:
    

  • projects/geckoview/config
    ... ... @@ -14,7 +14,7 @@ container:
    14 14
     var:
    
    15 15
       geckoview_version: 102.9.0esr
    
    16 16
       torbrowser_branch: 12.0-1
    
    17
    -  browser_build: 1
    
    17
    +  browser_build: 2
    
    18 18
       copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
    
    19 19
       deps:
    
    20 20
         - build-essential
    

  • rbm.conf
    ... ... @@ -72,7 +72,7 @@ buildconf:
    72 72
     
    
    73 73
     var:
    
    74 74
       torbrowser_version: '12.0.4'
    
    75
    -  torbrowser_build: 'build1'
    
    75
    +  torbrowser_build: 'build2'
    
    76 76
       torbrowser_incremental_from:
    
    77 77
         - 12.0.3
    
    78 78
       build_mar: 1