boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4f672e71 by Nicolas Vigier at 2026-06-25T15:22:50+02:00 Bug 41823: Add version for cbindgen and clang in toolchain updates list In addition to the revision (git hash) that we were already checking. - - - - - f9fed927 by Nicolas Vigier at 2026-06-25T15:25:15+02:00 Bug 41823: Update how we define version and var/llvm_major in llvm-project This will make it easier to automate the update of `version`. Suggested by @pierov in https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_req.... Co-authored-by: Pier Angelo Vendrame <pierov@torproject.org> - - - - - 2 changed files: - projects/llvm-project/config - tools/toolchain-updates/extract-firefox-versions-infos Changes: ===================================== projects/llvm-project/config ===================================== @@ -1,10 +1,10 @@ # vim: filetype=yaml sw=2 -version: "[% c('var/llvm_major') %].1.8" +version: "20.1.8" git_hash: 87f0227cb60147a26a1eeb4fb06e3b505e9c7261 git_url: https://github.com/llvm/llvm-project filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' var: - llvm_major: '20' + llvm_major: "[% c('version').split('\\.').0 %]" input_files: ===================================== tools/toolchain-updates/extract-firefox-versions-infos ===================================== @@ -129,9 +129,16 @@ sub get_clang_info { } my $fetch = YAML::XS::LoadFile('taskcluster/kinds/fetch/toolchains.yml'); - set_version_info("clang-$os", $fetch->{$clang_fetch}{fetch}{revision}); + my ($clang_version) = $fetch->{$clang_fetch}{description} =~ m/^clang (.+) source code$/; + set_version_info("clang-${os}_version", $clang_version); + set_version_info("clang-${os}_revision", $fetch->{$clang_fetch}{fetch}{revision}); - set_rbm_info("clang-$os", { + set_rbm_info("clang-${os}_version", { + project => 'llvm-project', + option => 'version', + targets => [ $rbm_os_target{$os} ], + }); + set_rbm_info("clang-${os}_revision", { project => 'llvm-project', option => 'git_hash', targets => [ $rbm_os_target{$os} ], @@ -142,17 +149,23 @@ sub get_clang_info { ## cbindgen sub get_cbindgen_info { my $fetch = YAML::XS::LoadFile('taskcluster/kinds/fetch/toolchains.yml'); - my $revision; + my ($revision, $version); T: foreach my $t (keys %$fetch) { next unless $fetch->{$t}{'fetch-alias'}; if ($fetch->{$t}{'fetch-alias'} eq 'cbindgen') { $revision = $fetch->{$t}{fetch}{revision}; + ($version) = $t =~ m/^cbindgen-(.+)/; last T; } } return 0 unless $revision; - set_version_info('cbindgen', $revision); - set_rbm_info('cbindgen', { + set_version_info('cbindgen_version', $version); + set_rbm_info('cbindgen_version', { + project => 'cbindgen', + option => 'version', + }); + set_version_info('cbindgen_revision', $revision); + set_rbm_info('cbindgen_revision', { project => 'cbindgen', option => 'git_hash', }); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/9... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/9... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help