Unverified Commit 7099a3ff authored by boklm's avatar boklm
Browse files

Bug 40334: Remove ff91esr target 

All platforms switched to >= 91, so we don't need the ff91esr target
anymore.

We still keep the options that allow us to easily change the versions
of cbindgen, node and rust, as we will probably need to change them later
for the android version.
parent 5c4ec887

projects/cbindgen/config

+4 −12
Original line number Diff line number Diff line
@@ -4,21 +4,13 @@ git_url: https://github.com/eqrion/cbindgen 
git_hash: '[% c("var/cbindgen_hash") %]'

filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'



var:

  cbindgen_version: 0.14.1

  cbindgen_hash: 0761b9bbe48d01ded1bbec45bbeea5544b3b1002

  cbindgen_vendor_hash: 1c500bc1b8de4eb400f90a528c4b5c6b2c7357e401a95c5354469a18fd365dbc

  cbindgen_vendor_people_tpo_user: gk

  container:

    use_container: 1



targets:

  ff91esr:

var:

  cbindgen_version: 0.19.0

  cbindgen_hash: d9e490ce8b836194595bd30611253a7028059da2

  cbindgen_vendor_hash: 7d99c195b180e28ca7499d8744d020b864f952a5ba699716707aec9a06b4ee8b

  cbindgen_vendor_people_tpo_user: boklm

  container:

    use_container: 1



input_files:

  - project: container-image

projects/clang/build

+4 −12
Original line number Diff line number Diff line
@@ -23,13 +23,6 @@ cd clang-source 
export LLVM_HOME=$(pwd)

mkdir build

cd build

# XXX: remove duplicated parts while fixing tor-browser-build#40048

[% IF ! c("var/ff91esr") %]

  cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \

                               -DCMAKE_BUILD_TYPE:STRING=Release \

       [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \

                               $LLVM_HOME

[% ELSE %]

cmake ../llvm -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \

                                  -DCMAKE_BUILD_TYPE=Release \

            [% IF c("var/android") -%]
@@ -37,7 +30,6 @@ cd build 
            [% END -%]

            [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \

                                  -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;lld"

[% END -%]

make -j[% c("buildconf/num_procs") %]

make install

cd /var/tmp/dist

projects/clang/config

+1 −10
Original line number Diff line number Diff line
@@ -3,15 +3,10 @@ version: '[% c("var/llvm_version") %]' 
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'



var:

  llvm_version: '[% pc("clang-source", "version") %]'

  llvm_version: '[% pc("llvm-project", "version") %]'

  container:

    use_container: 1



targets:

  ff91esr:

    var:

      llvm_version: '[% pc("llvm-project", "version") %]'



input_files:

  - project: container-image

  - name: '[% c("var/compiler") %]'
@@ -22,12 +17,8 @@ input_files: 
    enable: '[% c("var/linux") %] || [% c("var/android") %]'

  - project: cmake

    name: cmake

  - project: clang-source

    name: clang-source

    enable: '[% ! c("var/ff91esr") %]'

  - project: llvm-project

    name: clang-source

    enable: '[% c("var/ff91esr") %]'

  - project: python

    name: python

    enable: '[% c("var/linux") %]'

projects/firefox/config

+2 −7
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ git_submodule: 1 
gpg_keyring: torbutton.gpg



var:

  firefox_platform_version: 78.14.0

  firefox_version: '[% c("var/firefox_platform_version") %]esr'

  firefox_platform_version: 91.0.1

  firefox_version: '[% c("var/firefox_platform_version") %]'

  torbrowser_branch: 11.0

  branding_directory: 'browser/branding/alpha'

  copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
@@ -49,11 +49,6 @@ steps: 
        use_container: 0



targets:

  ff91esr:

    var:

      firefox_platform_version: 91.0.1

      firefox_version: '[% c("var/firefox_platform_version") %]'



  release:

    var:

      branding_directory: 'browser/branding/official'

projects/node/config

+2 −6
Original line number Diff line number Diff line
@@ -2,16 +2,12 @@ 
version: '[% c("var/node_version") %]'

filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'

var:

  node_version: 10.21.0

  node_hash: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b

  node_version: 10.23.1

  node_hash: 88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa

  container:

    use_container: 1



targets:

  ff91esr:

    var:

      node_version: 10.23.1

      node_hash: 88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa

  windows:

    var:

      arch_deps: