This is an automated email from the git hooks/post-receive script.
boklm pushed a change to branch master in repository tor-browser-bundle-testsuite.
from 6933288 Bug 40045: Run static-update-component in rsync-to-tbb-nightlies-master new bdc6f73 Bug 40061: Update tor-browser-build targets after tor-browser-build#40501 new ffecc79 Bug 40062: Use tor-browser-build.git main branch new c3f662b Bug 40062: Update tools/pull to follow main
The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: TBBTestSuite/TestSuite/TorBrowserBuild.pm | 29 +++++++++++++++++++---------- tools/pull | 12 ++++++------ 2 files changed, 25 insertions(+), 16 deletions(-)
This is an automated email from the git hooks/post-receive script.
boklm pushed a commit to branch master in repository tor-browser-bundle-testsuite.
commit bdc6f734cbed7ba7cec672c6106cab55d7864dbc Author: Nicolas Vigier boklm@torproject.org AuthorDate: Fri Jul 15 01:34:02 2022 +0200
Bug 40061: Update tor-browser-build targets after tor-browser-build#40501 --- TBBTestSuite/TestSuite/TorBrowserBuild.pm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm index d391bac..4ccbf20 100644 --- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm +++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm @@ -36,7 +36,8 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', - 'torbrowser-linux-x86_64', + 'browser-linux-x86_64', + 'torbrowser', ], publish_dir => 'nightly-linux-x86_64', }, @@ -54,7 +55,8 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', - 'torbrowser-linux-i686', + 'browser-linux-i686', + 'torbrowser', ], publish_dir => 'nightly-linux-i686', }, @@ -72,7 +74,8 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', - 'torbrowser-windows-i686', + 'browser-windows-i686', + 'torbrowser', ], publish_dir => 'nightly-windows-i686', }, @@ -90,7 +93,8 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', - 'torbrowser-windows-x86_64', + 'browser-windows-x86_64', + 'torbrowser', ], publish_dir => 'nightly-windows-x86_64', }, @@ -108,7 +112,8 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', - 'torbrowser-osx-x86_64', + 'browser-osx-x86_64', + 'torbrowser', ], publish_dir => 'nightly-osx-x86_64', }, @@ -126,7 +131,8 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', - 'torbrowser-android-armv7', + 'browser-android-armv7', + 'torbrowser', ], publish_dir => 'nightly-android-armv7', }, @@ -138,7 +144,8 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', - 'torbrowser-android-x86', + 'browser-android-x86', + 'torbrowser', ], publish_dir => 'nightly-android-x86', }, @@ -150,7 +157,8 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', - 'torbrowser-android-x86_64', + 'browser-android-x86_64', + 'torbrowser', ], publish_dir => 'nightly-android-x86_64', }, @@ -162,7 +170,8 @@ sub set_tests { targets => [ 'noversiondir', 'nightly', - 'torbrowser-android-aarch64', + 'browser-android-aarch64', + 'torbrowser', ], publish_dir => 'nightly-android-aarch64', },
This is an automated email from the git hooks/post-receive script.
boklm pushed a commit to branch master in repository tor-browser-bundle-testsuite.
commit ffecc7969ad3f2ff50fcb5b422dada726738746c Author: Nicolas Vigier boklm@torproject.org AuthorDate: Fri Jul 15 11:58:02 2022 +0200
Bug 40062: Use tor-browser-build.git main branch --- TBBTestSuite/TestSuite/TorBrowserBuild.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm index 4ccbf20..bb0033c 100644 --- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm +++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm @@ -204,7 +204,7 @@ sub pre_tests { git_url => 'https://git.torproject.org/builders/tor-browser-build.git', }); $gr->clone_fetch; - $gr->cmd('git', 'checkout', 'master'); + $gr->cmd('git', 'checkout', 'main'); chdir $gr->clone_dir(); copy($tbbinfos->{rbm_local_conf}, $gr->clone_dir() . '/rbm.local.conf') if $tbbinfos->{rbm_local_conf};
This is an automated email from the git hooks/post-receive script.
boklm pushed a commit to branch master in repository tor-browser-bundle-testsuite.
commit c3f662b45ca1eb38f85e6c173d611d6e442a1edc Author: Nicolas Vigier boklm@torproject.org AuthorDate: Fri Jul 15 12:04:15 2022 +0200
Bug 40062: Update tools/pull to follow main --- tools/pull | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/pull b/tools/pull index 71d9aec..52d716b 100755 --- a/tools/pull +++ b/tools/pull @@ -11,18 +11,18 @@ then fi bundle_commit=$(cat bundle/bundle_commit.txt) git init - git remote add origin https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git + git remote add origin https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite.... git fetch origin - git branch master $bundle_commit - git branch --set-upstream-to=origin/master master - git reset master + git branch main $bundle_commit + git branch --set-upstream-to=origin/main main + git reset main fi git config --replace-all --local gpg.program "$basedir/gpggit" if ! git symbolic-ref -q HEAD > /dev/null then - # checkout origin/master if we are not on a branch + # checkout origin/main if we are not on a branch remote="${1:-origin}" - branch="${2:-master}" + branch="${2:-main}" git fetch "$remote" git verify-commit "$remote/$branch" git checkout "$remote/$branch"
tor-commits@lists.torproject.org