tor-commits May 2021

tor-commits@lists.torproject.org

20 participants
1972 discussions

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 07 May '21

07 May '21

commit 73dd6023df262b1e1b7e1749864b641b583ec4df Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 08:48:25 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+he.po | 10 +++++----- contents+it.po | 4 ++-- contents+pt-BR.po | 12 ++++-------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/contents+he.po b/contents+he.po index af0eeee6ce..29abcd81ac 100644 --- a/contents+he.po +++ b/contents+he.po @@ -5,8 +5,8 @@ # erinm, 2020 # ION, 2020 # Omer I.S. <omeritzicschwartz(a)gmail.com>, 2021 -# Emma Peel, 2021 # Zeev Shilor <zshilor(a)gmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Zeev Shilor <zshilor(a)gmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5672,9 +5672,9 @@ msgid "" "Browser](https://www.torproject.org/download) and then using it to navigate " "to the blocked site will allow access." msgstr "" -"רוב הזמן, להוריד את דפדפן tor ]tor browser[ " -"(https://www.torproject.org/download) ואז לנווט שם לאתר החסום יאפשר לך לגלוש" -" בו" +"רוב הזמן, להוריד את דפדפן [Tor " +"Browser](https://www.torproject.org/download)ואז לנווט שם לאתר החסום יאפשר " +"לך לגלוש בו" #: https//support.torproject.org/censorship/censorship-1/ #: (content/censorship/censorship-1/contents+en.lrquestion.description) diff --git a/contents+it.po b/contents+it.po index 73340ad0e6..af77af7011 100644 --- a/contents+it.po +++ b/contents+it.po @@ -701,8 +701,8 @@ msgid "" "](../operating-system-os), with its mobile version available for Android and" " iOS." msgstr "" -"Firefox è disponibile per i [sistemi operativi] Windows, macOS e Linux " -"(..(sistema-operativo-so), con le versioni mobile disponibili per Android e " +"Firefox è disponibile per i [sistemi operativi](../operating-system-os) " +"Windows, macOS e Linux, con le versioni mobile disponibili per Android e " "iOS." #: https//support.torproject.org/glossary/firewall/ diff --git a/contents+pt-BR.po b/contents+pt-BR.po index c3b9c1b689..9d78ffc475 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -22,8 +22,8 @@ # Gus, 2021 # André Marcelo Alvarenga <alvarenga(a)kde.org>, 2021 # Daniel, 2021 -# Emma Peel, 2021 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -31,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -359,7 +359,7 @@ msgid "" "](../web-browser), and includes information like websites visited and when." msgstr "" "Um histórico de navegador é um registro de solicitações feitas durante o uso" -" de um [navegador web] [#navegador web] e inclui informações sobre quais " +" de um [navegador web](../web-browser) e inclui informações sobre quais " "sites foram visitados em que ocasião." #: https//support.torproject.org/glossary/browsing-history/ @@ -7210,7 +7210,7 @@ msgid "" " X.onion!](../../onionservices/onionservices-3)." msgstr "" "Se você não estiver conseguindo se conectar a um serviço onion, por favor " -"veja [Eu não consigo acessar X.onion(../../onionservices/onionservices-3)." +"veja [Eu não consigo acessar X.onion](../../onionservices/onionservices-3)." #: https//support.torproject.org/censorship/censorship-4/ #: (content/censorship/censorship-4/contents+en.lrquestion.title) @@ -9342,10 +9342,6 @@ msgid "" "team](https://community.torproject.org/relay/community-resources/bad-" "relays/) so we can sort out the issue." msgstr "" -"Se você recebeu essa bandeira, então nós descobrimos um problema e ou " -"atividade suspeita ao encaminhar tráfego através da sua saída e não fomos " -"capazes de contactar você. Por favor entre em contato com a [equipe de " -"retransmissores ruins]" #: https//support.torproject.org/operators/what-type-of-relays-are-most-needed/ #: (content/operators/what-type-of-relays-are-most-needed/contents+en.lrquestion.title)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 07 May '21

07 May '21

commit ee6febc22f6a62b1ac703d99b690c5b3c26f1cb2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 7 08:45:15 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+mr.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contents+mr.po b/contents+mr.po index e8d39f2e6d..73112777d3 100644 --- a/contents+mr.po +++ b/contents+mr.po @@ -3,6 +3,7 @@ # Prachi Joshi <josprachi(a)yahoo.com>, 2021 # erinm, 2021 # vinay bichave <vinaybichave4(a)gmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-07 12:21+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: vinay bichave <vinaybichave4(a)gmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Marathi (https://www.transifex.com/otf/teams/1519/mr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -283,8 +284,9 @@ msgid "" "community-team) for more help." msgstr "" "हे आपल्या समुदायाचे वर्णन करत असल्यास किंवा आपल्याला खात्री नसल्यास, कृपया " -"अधिक मदतीसाठी [आमच्या समुदाय कार्यसंघाशी संपर्क साधा] " -"(https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-community-team)" +"अधिक मदतीसाठी [आमच्या समुदाय कार्यसंघाशी संपर्क " +"साधा](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-community-" +"team)" #: https//community.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrpage.title) (dynamic)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 May '21

06 May '21

commit 1d8602dcf4726a1446a812b1a9f23d94000760ec Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 6 14:49:52 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+el.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contents+el.po b/contents+el.po index 64c43105fd..09cff3b7c9 100644 --- a/contents+el.po +++ b/contents+el.po @@ -12,8 +12,8 @@ # A Papac <ap909219(a)protonmail.com>, 2020 # anvo <fragos.george(a)hotmail.com>, 2021 # George Kitsoukakis <norhorn(a)gmail.com>, 2021 -# Emma Peel, 2021 # Christos Vidai <dizzy23designs(a)gmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -21,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Christos Vidai <dizzy23designs(a)gmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -267,8 +267,8 @@ msgid "" "[consensus](../consensus)." msgstr "" "Για τον προσδιορισμό της απόδοσης ενός ρελέ, τα ειδικά ρελέ που ονομάζονται " -"αρχές εύρους ζώνης λαμβάνουν περιοδικές μετρήσεις των [ρελέ] (../ ρελέ) στην" -" [συναίνεση] (../ συναίνεση)." +"αρχές εύρους ζώνης λαμβάνουν περιοδικές μετρήσεις των [ρελέ](../ ρελέ) στην " +"[συναίνεση](../ συναίνεση)." #: https//support.torproject.org/glossary/bridge/ #: (content/glossary/bridge/contents+en.lrword.term) @@ -292,8 +292,8 @@ msgid "" "[Pluggable transports](../pluggable-transports) are a type of bridge that " "helps disguise the fact that you are using Tor." msgstr "" -"Τα [Pluggable Transports] (../ pluggable-transports) είναι ένας τύπος " -"γέφυρας που βοηθά στη μεταμφίεση του γεγονότος ότι χρησιμοποιείτε το Tor." +"Τα [Pluggable Transports](../ pluggable-transports) είναι ένας τύπος γέφυρας" +" που βοηθά στη μεταμφίεση του γεγονότος ότι χρησιμοποιείτε το Tor." #: https//support.torproject.org/glossary/bridge-authority/ #: (content/glossary/bridge-authority/contents+en.lrword.term) @@ -305,7 +305,7 @@ msgstr "εξουσιοδότηση γέφυρας" msgid "" "A special-purpose relay that maintains the list of [bridges](../bridge)." msgstr "" -"Ένα ρελέ ειδικού σκοπού που διατηρεί τη λίστα των [γέφυρες] (../ γέφυρα)." +"Ένα ρελέ ειδικού σκοπού που διατηρεί τη λίστα των [γέφυρες](../ γέφυρα)." #: https//support.torproject.org/glossary/browser-fingerprinting/ #: (content/glossary/browser-fingerprinting/contents+en.lrword.term) @@ -348,7 +348,7 @@ msgid "" "](../web-browser), and includes information like websites visited and when." msgstr "" "Το ιστορικό προγράμματος περιήγησης είναι μια καταγραφή αιτημάτων που " -"υποβάλλονται κατά τη χρήση ενός [προγράμματος περιήγησης ιστού] (../ " +"υποβάλλονται κατά τη χρήση ενός [προγράμματος περιήγησης ιστού](../ " "πρόγραμμα περιήγησης ιστού) και περιλαμβάνει πληροφορίες όπως ιστότοπους που" " επισκέπτονται και πότε." @@ -383,10 +383,10 @@ msgid "" "hard time determining whether or not those requests are coming from humans " "or bots." msgstr "" -"[Tor] (../ tor-tor-network-core-tor) οι χρήστες συχνά εξυπηρετούνται " -"Captchas επειδή το Tor [relay] (../ relay) υποβάλλει τόσα πολλά αιτήματα που" -" μερικές φορές οι ιστότοποι δυσκολεύονται να καθορίσουν εάν αυτά τα αιτήματα" -" ή όχι προέρχονται από ανθρώπους ή ρομπότ." +"[Tor](../ tor-tor-network-core-tor) οι χρήστες συχνά εξυπηρετούνται Captchas" +" επειδή το Tor [relay](../ relay) υποβάλλει τόσα πολλά αιτήματα που μερικές " +"φορές οι ιστότοποι δυσκολεύονται να καθορίσουν εάν αυτά τα αιτήματα ή όχι " +"προέρχονται από ανθρώπους ή ρομπότ." #: https//support.torproject.org/glossary/captcha/ #: (content/glossary/captcha/contents+en.lrword.spelling)

1 0

[translation/gettor-website-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
by translation＠torproject.org 06 May '21

06 May '21

commit 750f169ce830223d958776d83c2dea02b58804a5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 6 14:45:43 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-cont… --- contents+tr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index acaa15427f..aae6f87e71 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -2,8 +2,8 @@ # Translators: # erinm, 2021 # Gus, 2021 -# Emma Peel, 2021 # Kaya Zeren <kayazeren(a)gmail.com>, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-25 10:47+CET\n" "PO-Revision-Date: 2021-03-24 14:33+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,29 +46,29 @@ msgid "" "- Step 1: Send a request to GetTor (gettor(a)torproject.org) specifying your " "operating system (and your locale). Ex: \"windows es\"" msgstr "" -"- 1. adım: İşletim sisteminizi (ve dil kodunuzu) belirterek GetTor hizmetine" -" (gettor(a)torproject.org) bir istek gönderin. Örnek: \"windows es\"" +"- 1 adım: İşletim sisteminizi (ve dil kodunuzu) belirterek GetTor hizmetine " +"(gettor(a)torproject.org) bir istek gönderin. Örnek: \"windows es\"" #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "" "- Step 2: GetTor will send you back a reply with links to download Tor " "Browser from our supported providers." msgstr "" -"- 2. adım: GetTor, destek veren hizmet sağlayıcılarından Tor Browser indirme" -" bağlantısının bulunduğu bir yanıt gönderir." +"- 2 adım: GetTor, destek veren hizmet sağlayıcılarından Tor Browser indirme " +"bağlantısının bulunduğu bir yanıt gönderir." #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "" "- Step 3: Download Tor Browser from one of the providers. When done, check " "the integrity of the downloaded files by verifying its signature." msgstr "" -"- 3. adım: Bir hizmet sağlayıcı seçip Tor Browser uygulamasını indirin. " +"- 3 adım: Bir hizmet sağlayıcı seçip Tor Browser uygulamasını indirin. " "İndirme tamamlandığında, indirilen dosyaların bütünlüğünü imzası ile " "doğrulayın." #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "- Step 4: If required, get some bridges!" -msgstr "- 4. adım: Gerekiyorsa köprüleri alın!" +msgstr "- 4 adım: Gerekiyorsa köprüleri alın!" #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "## GetTor Responder on Twitter"

1 0

[translation/torcheck_completed] https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed
by translation＠torproject.org 06 May '21

06 May '21

commit ef5b22ac70a75f50e5bdee4386bb561fa1369450 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 6 12:18:30 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 4aaa097180..ae9ab2f93a 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -15,7 +15,7 @@ # monsieurtino <monsieurtino(a)mailoo.org>, 2014-2015 # Onizuka, 2013 # PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2019 -# rike, 2014 +# u <u(a)451f.org>, 2014 # skhaen <skhaen(a)cyphercat.eu>, 2011 msgid "" msgstr ""

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 06 May '21

06 May '21

commit a71ee49b9478a6195b3e705a9458d202693f97e5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 6 12:16:40 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de.po b/de.po index 9115882851..960b88293d 100644 --- a/de.po +++ b/de.po @@ -33,7 +33,7 @@ # Tobias Bannert <tobannert(a)gmail.com>, 2014,2016 # Traumschule Riebau <traumschuleriebau(a)riseup.net>, 2018 # try once, 2015,2019 -# rike, 2014 +# u <u(a)451f.org>, 2014 # Will Smith <info(a)belvenservices.com>, 2018 msgid "" msgstr ""

1 0

[translation/mat-gui_completed] https://gitweb.torproject.org/translation.git/commit/?h=mat-gui_completed
by translation＠torproject.org 06 May '21

06 May '21

commit 17609c4490ac2c03b142aa3a32e0ecf02da77a93 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 6 12:15:29 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=mat-gui_completed --- de.po | 4 ++-- fr.po | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/de.po b/de.po index b969542e3f..cec0d1de6e 100644 --- a/de.po +++ b/de.po @@ -7,13 +7,13 @@ # K.N., 2012 # max weber, 2015,2017 # rike, 2014 -# rike, 2014 +# u <u(a)451f.org>, 2014 # Sacro <Scion(a)T-Online.de>, 2013 # Sacro <Scion(a)T-Online.de>, 2013 # spriver, 2018 # 6d7881afd10822f08493414478ac30ba_4919e85, 2016 # Tobias Bannert <tobannert(a)gmail.com>, 2014 -# rike, 2014-2015 +# u <u(a)451f.org>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" diff --git a/fr.po b/fr.po index d002ad1309..521967bda4 100644 --- a/fr.po +++ b/fr.po @@ -10,7 +10,7 @@ # AO <ao(a)localizationlab.org>, 2016 # Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015-2016 # Onizuka, 2013 -# rike, 2014 +# u <u(a)451f.org>, 2014 msgid "" msgstr "" "Project-Id-Version: Tor Project\n"

1 0

[tor-browser-build/maint-10.0-android] Bug 25934: Disable building of rust docs
by sysrqb＠torproject.org 06 May '21

06 May '21

commit a7604bd5f8963de896a54d6723e04cfb2b472e2a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 22 13:51:22 2021 +0100 Bug 25934: Disable building of rust docs --- projects/rust/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/rust/build b/projects/rust/build index 31e1070..9609758 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -60,7 +60,7 @@ cd /var/tmp/build/rustc-[% c('version') %]-src mkdir build cd build -../configure --prefix=$distdir [% c("var/configure_opt") %] +../configure --prefix=$distdir --disable-docs --disable-compiler-docs [% c("var/configure_opt") %] make -j[% c("buildconf/num_procs") %] make install

1 0

[tor-browser-build/maint-10.0-android] Bug 40259: Update components for mozilla88-based Fenix (GeckoView part)
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 1af3fb3ab394e85be844d0f577c57607c4a38a8a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Apr 5 21:38:47 2021 +0000 Bug 40259: Update components for mozilla88-based Fenix (GeckoView part) Now Geckoview uses build-tools 30.0.2, so this patch updates android-toolchain, as well. --- projects/android-toolchain/build | 38 ++++++++++++------------ projects/android-toolchain/config | 36 +++++++++++----------- projects/geckoview/config | 8 ++--- projects/geckoview/list_toolchain_updates_checks | 2 +- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index e352b67..29d79e5 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -3,9 +3,9 @@ export PROJECT_PATH=/var/tmp/dist/[% project %] export SDK_HOME=$PROJECT_PATH/android-sdk-linux export NDK_HOME=$PROJECT_PATH/android-ndk -android_release_dir=android-10 -android_release_dir_old=android-9 -android_release_dir_new=android-11 +android_release_dir_9=android-9 +android_release_dir_10=android-10 +android_release_dir_11=android-11 # Make directories mkdir -p $NDK_HOME $SDK_HOME @@ -26,27 +26,27 @@ done # Tool Archives cd $SDK_HOME unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME -mkdir -p build-tools/[% c("version") %] -mv $android_release_dir/* build-tools/[% c("version") %] +mkdir -p build-tools/[% c("var/version_30") %] +mv $android_release_dir_11/* build-tools/[% c("var/version_30") %] + +unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME +mkdir -p platforms/android-[% c("var/android_api_level") %] +mv $android_release_dir_11/* platforms/android-[% c("var/android_api_level") %] # Apart from GeckoView all other projects do still need build-tools 28.0.3 as # they are using the Gradle plugin 3.2.1 - 3.6.0 without specifying # `buildToolsVersion`. -unzip -qq $HOME/[% c("input_files_by_name/build_tools_old") %] -d $SDK_HOME -mkdir -p build-tools/[% c("version_old") %] -mv $android_release_dir_old/* build-tools/[% c("version_old") %] - -unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME -mkdir -p platforms/android-[% c("var/android_api_level") %] -mv $android_release_dir/* platforms/android-[% c("var/android_api_level") %] +unzip -qq $HOME/[% c("input_files_by_name/build_tools_28") %] -d $SDK_HOME +mkdir -p build-tools/[% c("var/version_28") %] +mv $android_release_dir_9/* build-tools/[% c("var/version_28") %] -unzip -qq $HOME/[% c("input_files_by_name/build_tools_new") %] -d $SDK_HOME -mkdir -p build-tools/[% c("var/android_api_level_new") %] -mv $android_release_dir_new/* build-tools/[% c("var/android_api_level_new") %] +unzip -qq $HOME/[% c("input_files_by_name/build_tools_29") %] -d $SDK_HOME +mkdir -p build-tools/[% c("var/version_29") %] +mv $android_release_dir_10/* build-tools/[% c("var/version_29") %] -unzip -qq $HOME/[% c("input_files_by_name/platform_new") %] -d $SDK_HOME -mkdir -p platforms/android-[% c("var/android_api_level_new") %] -mv $android_release_dir_new/* platforms/android-[% c("var/android_api_level_new") %] +unzip -qq $HOME/[% c("input_files_by_name/platform_29") %] -d $SDK_HOME +mkdir -p platforms/android-[% c("var/android_api_level_29") %] +mv $android_release_dir_10/* platforms/android-[% c("var/android_api_level_29") %] unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME @@ -56,7 +56,7 @@ mkdir emulator cp tools/emulator emulator/ # Cleanup -rm -fR $android_release_dir $android_release_dir_old $android_release_dir_new +rm -fR $android_release_dir_9 $android_release_dir_10 $android_release_dir_11 # Archive dist directory cd /var/tmp/dist diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 6d78b37..5196528 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -1,8 +1,10 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 29.0.2 -version_old: 28.0.3 +version: '[% c("var/version_28") %]+[% c("var/version_29") %]+[% c("var/version_30") %]' var: + version_30: 30.0.2 + version_29: 29.0.2 + version_28: 28.0.3 container: use_container: 1 deps: @@ -25,36 +27,36 @@ var: export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin mkdir -p "$GRADLE_HOME" google_repo: https://dl.google.com/android/repository - android_api_level: 29 - android_platform_revision: 04 - android_api_level_new: 30 - android_platform_revision_new: 03 + android_api_level: 30 + android_platform_revision: 03 + android_api_level_29: 29 + android_platform_revision_29: 04 android_ndk_version: 21 android_ndk_revision: d sdk_tools_version: 4333796 input_files: - project: container-image - - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_30") %]-linux.zip' name: build_tools + sha256sum: 565af786dc0cc1941002174fb945122eabd080b222cd4c7c3d9a2ae0fabf5dc4 + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_29") %]-linux.zip' + name: build_tools_29 sha256sum: 1e9393cbfd4a4b82e30e7f55ab38db4a5a3259db93d5821c63597bc74522fa08 - - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version_old") %]-linux.zip' - name: build_tools_old + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_28") %]-linux.zip' + name: build_tools_28 sha256sum: 7954956a40633c88f693d638cbc23f68e9e2499dc7a4b7dfdaf6a3e91387749a + - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_29") %]_r[% c("var/android_platform_revision_29") %].zip' + name: platform_29 + sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69 - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") %]_r[% c("var/android_platform_revision") %].zip' name: platform - sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69 - - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/android_api_level_new") %]-linux.zip' - name: build_tools_new - sha256sum: ed3b7f9b2d15e90a12c2e739adb749d7d834e2f953e677380206bd14db135c6c - - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level_new") %]_r[% c("var/android_platform_revision_new") %].zip' - name: platform_new sha256sum: f3f5b75744dbf6ee6ed3e8174a71e513bfee502d0bc3463ea97e517bff68d84e # ./mach bootstrap is fetching the latest version, so it does not seem to # matter which particular version we are using. Pin to the one fitting best to # SDK version/build-tools version. - - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip' + - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("var/version_30") %]-linux.zip' name: platform_tools - sha256sum: 633b6dfa245f5dc58d15da9ead655bcd14de5784196ec0f0dc7e37a5acb61be4 + sha256sum: f7306a7c66d8149c4430aff270d6ed644c720ea29ef799dc613d3dc537485c6e - URL: '[% c("var/google_repo") %]/sdk-tools-linux-[% c("var/sdk_tools_version") %].zip' name: android_sdk_tools sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 diff --git a/projects/geckoview/config b/projects/geckoview/config index 84d212d..4cc3408 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 87.0 + geckoview_version: 88.0b4 torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -138,10 +138,10 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - git_url: https://github.com/mozilla/gecko-dev.git + #git_url: https://github.com/mozilla/gecko-dev.git # 88.0b8 - git_hash: 43ab49774f70a5c70b2cd69a2b2a8bc0a3be20bf - tag_gpg_id: 0 + #git_hash: 43ab49774f70a5c70b2cd69a2b2a8bc0a3be20bf + #tag_gpg_id: 0 input_files: [] var: container: diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks index ffc5e23..f31fa51 100644 --- a/projects/geckoview/list_toolchain_updates_checks +++ b/projects/geckoview/list_toolchain_updates_checks @@ -44,7 +44,7 @@ if (m/build_tools_version\\s*=\\s*"([^"]+)"/) { } EOF needed=$(cat build/moz.configure/android-sdk.configure | perl -ne "$p") -current='[% pc("android-toolchain", "version") %]' +current='[% pc("android-toolchain", "var/version_30") %]' check_update_needed build_tools "$needed" "$current"

1 0

[tor-browser-build/maint-10.0-android] Bug 34108: Add scripts to check for needed toolchain updates
by sysrqb＠torproject.org 06 May '21

06 May '21

commit 9696b8e15ce1c766311c43b821997654e074af08 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 5 13:15:17 2021 +0200 Bug 34108: Add scripts to check for needed toolchain updates Checking toolchain updates can be done with the following commands: make list_toolchain_updates-geckoview make list_toolchain_updates-application-services make list_toolchain_updates-android-components make list_toolchain_updates-fenix --- Makefile | 12 ++ projects/android-components/config | 20 ++ .../list_toolchain_updates_checks | 85 +++++++++ projects/android-toolchain/config | 3 +- projects/application-services/config | 7 + .../list_toolchain_updates_checks | 97 ++++++++++ projects/common/list_toolchain_updates | 38 ++++ projects/fenix/config | 7 + projects/fenix/list_toolchain_updates_checks | 73 ++++++++ projects/geckoview/config | 5 + projects/geckoview/list_toolchain_updates_checks | 202 +++++++++++++++++++++ projects/glean/config | 9 + projects/llvm-project/config | 2 +- rbm.conf | 3 + 14 files changed, 561 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7e2e104..fa613e1 100644 --- a/Makefile +++ b/Makefile @@ -201,6 +201,18 @@ dmg2mar-alpha: submodule-update tools/update-responses/download_missing_versions alpha CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha +list_toolchain_updates-fenix: submodule-update + $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + +list_toolchain_updates-android-components: submodule-update + $(rbm) build android-components --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + +list_toolchain_updates-application-services: submodule-update + $(rbm) build application-services --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + +list_toolchain_updates-geckoview: submodule-update + $(rbm) build geckoview --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 + submodule-update: git submodule update --init diff --git a/projects/android-components/config b/projects/android-components/config index eb1b7de..c9c5d55 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -50,3 +50,23 @@ input_files: - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2 sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2 enable: '[% !c("var/fetch_gradle_dependencies") %]' + +steps: + list_toolchain_updates: + var: + container: + use_container: 0 + get_glean_version: | + #!/bin/bash + read -d '' p << 'EOF' || true + if (m/const\\sval\\smozilla_glean\\s=\\s"([^"]+)"/) { + print $1; + exit; + } + EOF + perl -ne "$p" < buildSrc/src/main/java/Dependencies.kt + glean_version: '[% exec(c("var/get_glean_version")) %]' + input_files: + - name: glean + project: glean + pkg_type: src diff --git a/projects/android-components/list_toolchain_updates_checks b/projects/android-components/list_toolchain_updates_checks new file mode 100644 index 0000000..a46afb4 --- /dev/null +++ b/projects/android-components/list_toolchain_updates_checks @@ -0,0 +1,85 @@ +#!/bin/bash + +# compileSdkVersion +read -d '' p << 'EOF' || true +if (m/compileSdkVersion:\\s+(.*)$/) { + print $1; + exit; +} +EOF +needed=$(cat .config.yml | perl -ne "$p") +current=30 +check_update_needed compileSdkVersion "$needed" "$current" + + +# targetSdkVersion +read -d '' p << 'EOF' || true +if (m/targetSdkVersion:\\s+(.*)$/) { + print $1; + exit; +} +EOF +needed=$(cat .config.yml | perl -ne "$p") +current=30 +check_update_needed targetSdkVersion "$needed" "$current" + + +# minSdkVersion +read -d '' p << 'EOF' || true +if (m/minSdkVersion:\\s+(.*)$/) { + print $1; + exit; +} +EOF +needed=$(cat .config.yml | perl -ne "$p") +current=21 +check_update_needed minSdkVersion "$needed" "$current" + + +# application-services +read -d '' p << 'EOF' || true +if (m/const\\sval\\smozilla_appservices\\s=\\s"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Dependencies.kt | perl -ne "$p") +current='[% pc("application-services", "version") %]' +check_update_needed application-services "$needed" "$current" + + +# glean_parser +read -d '' p << 'EOF' || true +if (m/^\\s*"glean_parser==([^"]+)",/) { + print $1; + exit; +} +EOF +tar xf $rootdir/[% c('input_files_by_name/glean') %] +needed=$(cat glean-[% c("var/glean_version") %]/glean-core/python/setup.py | perl -ne "$p") +current='[% c("var/glean_parser") %]' +check_update_needed glean_parser "$needed" "$current" + + +# gradle +read -d '' p << 'EOF' || true +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { + print $1; + exit; +} +EOF +needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p") +current='[% c("var/gradle_version") %]' +check_update_needed gradle "$needed" "$current" + + +# android-gradle-plugin +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+android_gradle_plugin\\s+=\\s+"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Dependencies.kt | perl -ne "$p") +current='4.0.1' +check_update_needed android-gradle-plugin "$needed" "$current" diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index dc30b4d..6d78b37 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -31,6 +31,7 @@ var: android_platform_revision_new: 03 android_ndk_version: 21 android_ndk_revision: d + sdk_tools_version: 4333796 input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' @@ -54,7 +55,7 @@ input_files: - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip' name: platform_tools sha256sum: 633b6dfa245f5dc58d15da9ead655bcd14de5784196ec0f0dc7e37a5acb61be4 - - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' + - URL: '[% c("var/google_repo") %]/sdk-tools-linux-[% c("var/sdk_tools_version") %].zip' name: android_sdk_tools sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux-x86_64.zip' diff --git a/projects/application-services/config b/projects/application-services/config index 951d5b0..6a80ffc 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -81,3 +81,10 @@ input_files: - filename: viaduct-workaround.patch - filename: viaduct-workaround2.patch - filename: update-cargo-lock.patch + +steps: + list_toolchain_updates: + input_files: [] + var: + container: + use_container: 0 diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks new file mode 100644 index 0000000..69c232c --- /dev/null +++ b/projects/application-services/list_toolchain_updates_checks @@ -0,0 +1,97 @@ +#!/bin/bash + +# ndkVersion +read -d '' p << 'EOF' || true +if (m/^\\s*ndkVersion:\\s"([^"]*)",/) { + print $1; + exit; +} +EOF +needed=$(cat build.gradle | perl -ne "$p") +current='21.3.6528147' +check_update_needed ndkVersion "$needed" "$current" + + +# compileSdkVersion +read -d '' p << 'EOF' || true +if (m/^\\s*compileSdkVersion:\\s([^"]*),/) { + print $1; + exit; +} +EOF +needed=$(cat build.gradle | perl -ne "$p") +current=29 +check_update_needed compileSdkVersion "$needed" "$current" + + +# minSdkVersion +read -d '' p << 'EOF' || true +if (m/^\\s*minSdkVersion:\\s([^"]*),/) { + print $1; + exit; +} +EOF +needed=$(cat build.gradle | perl -ne "$p") +current=21 +check_update_needed minSdkVersion "$needed" "$current" + + +# gradle +read -d '' p << 'EOF' || true +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { + print $1; + exit; +} +EOF +needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p") +current='[% c("var/gradle_version") %]' +check_update_needed gradle "$needed" "$current" + + +# nss-nspr +read -d '' p << 'EOF' || true +if (m/NSS_ARCHIVE="nss-(.*-with-nspr-.*)\\.tar\\.gz"/) { + print $1; + exit; +} +EOF +needed=$(cat libs/build-all.sh | perl -ne "$p") +current='[% pc("nss", "version") %]-with-nspr-[% pc("nss", "nspr_version") %]' +check_update_needed nss-nspr "$needed" "$current" + + +# sqlcipher +read -d '' p << 'EOF' || true +if (m/SQLCIPHER_VERSION="([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat libs/build-all.sh | perl -ne "$p") +current='[% pc("sqlcipher", "version") %]' +check_update_needed sqlcipher "$needed" "$current" + + +# android-gradle-plugin +read -d '' p << 'EOF' || true +if (m/^\\s*ext\\.android_gradle_plugin_version\\s=\\s'([^']*)'/) { + print $1; + exit; +} +EOF +needed=$(cat build.gradle | perl -ne "$p") +current='4.0.1' +check_update_needed android-gradle-plugin "$needed" "$current" + + +# android-components +read -d '' p << 'EOF' || true +if (m/^\\s*ext\\.android_components_version\\s=\\s'([^']*)'/) { + print $1; + exit; +} +EOF +needed=$(cat build.gradle | perl -ne "$p") +current=71.0.0 +check_update_needed android-components "$needed" "$current" + diff --git a/projects/common/list_toolchain_updates b/projects/common/list_toolchain_updates new file mode 100644 index 0000000..4cfd829 --- /dev/null +++ b/projects/common/list_toolchain_updates @@ -0,0 +1,38 @@ +#!/usr/bin/bash + +set -e + +rootdir="$(pwd)" +no_updates="$rootdir/no_updates.txt" +updates="$rootdir/updates.txt" + +tar -xf [% project %]-[% c('version') %].tar.gz +cd [% project %]-[% c('version') %] + +function check_update_needed() { + name="$1" + v1="$2" + v2="$3" + if test "$v1" = "$v2" + then + echo "* $name ($v1)" >> "$no_updates" + else + echo "* $name needs to be updated to $v1 (currently at $v2)" >> "$updates" + fi +} + +[% INCLUDE list_toolchain_updates_checks %] + +echo '### Component: [% project %] ([% c("git_hash") %])' + +if test -f "$updates" +then + echo "The following components need to be updated:" + cat "$updates" + echo +fi +if test -f "$no_updates" +then + echo "The following components don't need to be updated:" + cat "$no_updates" +fi diff --git a/projects/fenix/config b/projects/fenix/config index cabdb55..a72fff4 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -61,3 +61,10 @@ input_files: name: tor-android-service - project: tor-onion-proxy-library name: topl + +steps: + list_toolchain_updates: + input_files: [] + var: + container: + use_container: 0 diff --git a/projects/fenix/list_toolchain_updates_checks b/projects/fenix/list_toolchain_updates_checks new file mode 100644 index 0000000..43dd1b4 --- /dev/null +++ b/projects/fenix/list_toolchain_updates_checks @@ -0,0 +1,73 @@ +#!/bin/bash + +# android-components +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+VERSION\\s+=\\s+"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/AndroidComponents.kt | perl -ne "$p") +current='[% pc("android-components", "var/android_components_version") %]' +check_update_needed android-components "$needed" "$current" + + +# targetSdkVersion +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+targetSdkVersion\\s+=\\s+([^"]+)/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p") +current=29 +check_update_needed targetSdkVersion "$needed" "$current" + + +# compileSdkVersion +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+compileSdkVersion\\s+=\\s+([^"]+)/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p") +current=29 +check_update_needed compileSdkVersion "$needed" "$current" + + +# minSdkVersion +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+minSdkVersion\\s+=\\s+([^"]+)/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Config.kt | perl -ne "$p") +current=21 +check_update_needed compileSdkVersion "$needed" "$current" + + +# gradle +read -d '' p << 'EOF' || true +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { + print $1; + exit; +} +EOF +needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p") +current='[% c("var/gradle_version") %]' +check_update_needed gradle "$needed" "$current" + + +# android-gradle-plugin +read -d '' p << 'EOF' || true +if (m/const\\s+val\\s+android_gradle_plugin\\s+=\\s+"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat buildSrc/src/main/java/Dependencies.kt | perl -ne "$p") +current='4.0.1' +check_update_needed android-gradle-plugin "$needed" "$current" + diff --git a/projects/geckoview/config b/projects/geckoview/config index a893d31..d186c8b 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -137,6 +137,11 @@ steps: target_prepend: - torbrowser-android-x86_64 + list_toolchain_updates: + input_files: [] + var: + container: + use_container: 0 targets: nightly: diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks new file mode 100644 index 0000000..ffc5e23 --- /dev/null +++ b/projects/geckoview/list_toolchain_updates_checks @@ -0,0 +1,202 @@ +#!/bin/bash + +# ndk version +read -d '' p << 'EOF' || true +if (m/^\\s*NDK_VERSION\\s*=\\s*"(.+)"/) { + print $1; + exit; +} +EOF +needed=$(cat python/mozboot/mozboot/android.py | perl -ne "$p") +current='r[% pc("android-toolchain", "var/android_ndk_version") %][% pc("android-toolchain", "var/android_ndk_revision") %]' +check_update_needed ndk_version "$needed" "$current" + + +# rust +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/rust.yml'); +foreach my $t (keys %$d) { + if ($d->{$t}{run}{'toolchain-alias'} eq 'linux64-rust-android') { + my $channel; + foreach my $arg (@{$d->{$t}{run}{arguments}}) { + if ($arg eq '--channel') { + $channel = 1; + next; + } + if ($channel) { + print $arg; + exit; + } + } + } +} +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("rust", "version") %]' +check_update_needed rust "$needed" "$current" + + +# build_tools +read -d '' p << 'EOF' || true +if (m/build_tools_version\\s*=\\s*"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat build/moz.configure/android-sdk.configure | perl -ne "$p") +current='[% pc("android-toolchain", "version") %]' +check_update_needed build_tools "$needed" "$current" + + +# target_sdk +read -d '' p << 'EOF' || true +if (m/target_sdk_version\\s*=\\s*"(.+)"/) { + print $1; + exit; +} +EOF +needed=$(cat build/moz.configure/android-sdk.configure | perl -ne "$p") +current='[% pc("android-toolchain", "var/android_api_level") %]' +check_update_needed target_sdk "$needed" "$current" + + +# sdk-tools +read -d '' p << 'EOF' || true +if (m|https://dl\\.google\\.com/android/repository/sdk-tools-.+-([^-]+).zip|) { + print $1; + exit; +} +EOF +needed=$(cat python/mozboot/mozboot/android.py | perl -ne "$p") +current='[% pc("android-toolchain", "var/sdk_tools_version") %]' +check_update_needed sdk-tools "$needed" "$current" + + +# min-android +read -d '' p << 'EOF' || true +use Path::Tiny; +use Digest::SHA qw(sha256_hex); +my $f; +my $min_indent; +foreach (path('build/moz.configure/android-ndk.configure')->lines_utf8) { + if ($_ eq "def min_android_version(target):\\n") { + $f = $_; + next; + } else { + next unless $f; + } + m/^(\\s*)/; + my $indent = length $1; + $min_indent = $indent unless $min_indent; + last if $indent < $min_indent; + $f .= $_; +} +print substr(sha256_hex($f), 0, 10); +EOF +needed=$(perl -e "$p") +# We can't easily parse the min_android_version function. +# Instead we get a checksum of the function, and manually check it when +# it was updated. +# Current value of min_android_version is: +# 21 on aarch64, x86_64 +# 16 on other archs +current=303de6de36 +check_update_needed min-android "$needed" "$current" + + +# min_sdk +read -d '' p << 'EOF' || true +if (m/^\\s*MOZ_ANDROID_MIN_SDK_VERSION\\s*=\\s*([^\\s]+)/) { + print $1; + exit; +} +EOF +needed=$(cat mobile/android/confvars.sh | perl -ne "$p") +current=16 +check_update_needed min_sdk "$needed" "$current" + + +# gradle +read -d '' p << 'EOF' || true +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { + print $1; + exit; +} +EOF +needed=$(cat gradle/wrapper/gradle-wrapper.properties | perl -ne "$p") +current='[% c("var/gradle_version") %]' +check_update_needed gradle "$needed" "$current" + + +# cbindgen +read -d '' p << 'EOF' || true +if (m/^\\s*cbindgen_min_version\\s*=\\s*Version\$"([^"]+)"\$/) { + print $1; + exit; +} +EOF +needed=$(cat build/moz.configure/bindgen.configure | perl -ne "$p") +current='[% pc("cbindgen", "version") %]' +check_update_needed cbindgen "$needed" "$current" + + +# nasm +read -d '' p << 'EOF' || true +if (m/^\\s*MODERN_NASM_VERSION\\s*=\\s*LooseVersion\$"([^"]+)"\$/) { + print $1; + exit; +} +EOF +needed=$(cat python/mozboot/mozboot/base.py | perl -ne "$p") +current='2.14' +check_update_needed nasm "$needed" "$current" + + +# clang +read -d '' p << 'EOF' || true +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/clang.yml'); +my $clang_toolchain; +foreach my $t (keys %$d) { + if ($d->{$t}{run}{'toolchain-alias'} eq 'linux64-clang-android-cross') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + $clang_toolchain = $fetch if $fetch =~ m/^clang-.*/; + } + last; + } +} + +if (!$clang_toolchain) { + print STDERR "Error: could not find clang toolchain"; + exit 1; +} + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +print $fetch->{$clang_toolchain}{fetch}{revision}; +EOF +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("llvm-project", "git_hash") %]' +check_update_needed clang "$needed" "$current" + + +# node +read -d '' p << 'EOF' || true +if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { + print $1; + exit; +} +EOF +needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +current='[% pc("node", "version") %]' +check_update_needed node "$needed" "$current" + + +# python +read -d '' p << 'EOF' || true +if (m/find_python3_executable\\(min_version\\s*=\\s*"([^"]+)"/) { + print $1; + exit; +} +EOF +needed=$(cat build/moz.configure/init.configure | perl -ne "$p") +current=3.6.0 +check_update_needed python "$needed" "$current" diff --git a/projects/glean/config b/projects/glean/config new file mode 100644 index 0000000..45bc43b --- /dev/null +++ b/projects/glean/config @@ -0,0 +1,9 @@ +# vim: filetype=yaml sw=2 +git_hash: 'v[% c("version") %]' +git_url: https://github.com/mozilla/glean.git +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: '[% pc(c("origin_project"), "var/glean_version", { step => "list_toolchain_updates" }) %]' + +src: | + #!/bin/bash + mv -f [% project %]-[% c('version') %].tar.gz [% dest_dir %]/[% c('filename') %] diff --git a/projects/llvm-project/config b/projects/llvm-project/config index 822f08d..c6fa2d8 100644 --- a/projects/llvm-project/config +++ b/projects/llvm-project/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 version: 11.0.1 -git_hash: 43ff75f2c3feef64f9d73328230d34dac8832a9 +git_hash: 43ff75f2c3feef64f9d73328230d34dac8832a91 git_url: https://github.com/llvm/llvm-project filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' diff --git a/rbm.conf b/rbm.conf index cbc705a..646f353 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,6 +15,9 @@ steps: set -e mkdir -p '[% dest_dir %]' mv -vf '[% project %]-[% c("version") %].tar.xz' '[% dest_dir %]/[% c("filename") %]' + list_toolchain_updates: + build_log: '-' + list_toolchain_updates: '[% INCLUDE list_toolchain_updates %]' # buildconf contains build options that the user can change in rbm.local.conf # When adding a new option to buildconf, a default value should be defined

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2021