[tbb-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41166: Use the GitHub repository for firefox-l10n.

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
a82df901 by Pier Angelo Vendrame at 2024-07-09T18:23:49+02:00
Bug 41166: Use the GitHub repository for firefox-l10n.

Mozilla uplifted Bug 1900421 to 115 to 128, so we have to switch to the
new GitHub repository immediately as well.

- - - - -


2 changed files:

- README
- projects/firefox-l10n/config


Changes:

=====================================
README
=====================================
@@ -10,7 +10,7 @@ etc ...). You will need to install the uidmap package, providing the
 newuidmap and newgidmap commands.
 
 The sources of most components are downloaded using git, which needs to
-be installed. The mercurial package is also needed.
+be installed.
 
 Zstandard (zstd) is used to compress some tarballs and needs to be
 installed. You'll also need tar >= 1.31, for zstd support.
@@ -46,7 +46,7 @@ If you are running Debian or Ubuntu, you can install them with:
                   libparallel-forkmanager-perl libpath-tiny-perl \
                   libsort-versions-perl libstring-shellquote-perl \
                   libtemplate-perl libxml-libxml-perl libxml-writer-perl \
-                  libyaml-libyaml-perl git mercurial uidmap zstd
+                  libyaml-libyaml-perl git uidmap zstd
 
 If you are running Fedora, CentOS or RHEL, you can install them with:
 
@@ -57,7 +57,7 @@ If you are running Fedora, CentOS or RHEL, you can install them with:
               "perl(File::Copy::Recursive)" "perl(String::ShellQuote)" \
               "perl(Sort::Versions)" "perl(Digest::SHA)" "perl(Data::UUID)" \
               "perl(Data::Dump)" "perl(DateTime)" "perl(XML::Writer)" \
-              "perl(Parallel::ForkManager)" perl-ph mercurial git zstd
+              "perl(Parallel::ForkManager)" perl-ph git zstd
 
 If you are running an Arch based system, you should be able to install them with:
 


=====================================
projects/firefox-l10n/config
=====================================
@@ -2,15 +2,22 @@
 version: '[% pc("firefox", "abbrev") %]'
 filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %]'
 link_input_files: 1
+# We need to specify git_url in the root to make this project recognized as a
+# git project, we canoot specify the git_url only in the step.
+# However, once we specify a git_url, we need to specify a valid git_hash for
+# the final stage, even though we are not going to use it.
+# Any hash will work, as long as we can run git archive on it.
+git_url: https://github.com/mozilla-l10n/firefox-l10n.git
+git_hash: c1523924f0e10259e1a80b8268556f6f7a0b29bf
 
 steps:
   fetch_locale:
-    filename: 'l10n-[% c("input_file_var/locale") %]-[% c("hg_hash") %]-[% c("var/build_id") %].tar.xz'
-    version: '[% c("hg_hash") %]'
+    filename: 'l10n-[% c("input_file_var/locale") %]-[% c("abbrev") %]-[% c("var/build_id") %].tar.xz'
+    version: '[% c("git_hash") %]'
     fetch_locale: |
       [% c("var/set_default_env") -%]
       tar xf '[% project %]-[% c("version") %].tar.[% c("compress_tar") %]'
-      mv [% project %]-[% c("version") %] [% c("input_file_var/locale") %]
+      cd [% project %]-[% c("version") %]
       tar caf '[% dest_dir %]/[% c("filename") %]' [% c("input_file_var/locale") %]
     input_files: []
 --- |
@@ -38,9 +45,7 @@ steps:
           name => $locale,
           project => 'firefox-l10n',
           pkg_type => 'fetch_locale',
-          hg_hash => $revision,
-          hg_url => "https://hg.mozilla.org/l10n-central/$locale",
-          hg_clone_subdir => $locale,
+          git_hash => $revision,
           input_file_var => {
             locale => $locale,
           },



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

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a82df901c732b325e6b27c6bdff849a53e5ae83f
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20240709/d7670b1a/attachment-0001.htm>