[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [builders/tor-browser-build] branch main updated: Bug 40639: Removed tor-launcher references
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch main
in repository builders/tor-browser-build.
The following commit(s) were added to refs/heads/main by this push:
new 0cb8ee4a Bug 40639: Removed tor-launcher references
0cb8ee4a is described below
commit 0cb8ee4aa02e139aa80aab68ac85a4ffc82050ca
Author: Pier Angelo Vendrame <pierov@xxxxxxxxxxxxxx>
AuthorDate: Thu Oct 20 15:28:44 2022 +0200
Bug 40639: Removed tor-launcher references
---
.gitlab/issue_templates/Release Prep - Alpha.md | 12 ------------
doc/MAKEFILE.txt | 2 +-
projects/firefox/build | 5 -----
projects/firefox/config | 3 ---
projects/release/build | 1 -
projects/release/config | 9 ---------
projects/tor-launcher/build | 8 --------
projects/tor-launcher/config | 24 ------------------------
tools/signing/check_file_counts | 3 ---
9 files changed, 1 insertion(+), 66 deletions(-)
diff --git a/.gitlab/issue_templates/Release Prep - Alpha.md b/.gitlab/issue_templates/Release Prep - Alpha.md
index 1735c6b1..d396506f 100644
--- a/.gitlab/issue_templates/Release Prep - Alpha.md
+++ b/.gitlab/issue_templates/Release Prep - Alpha.md
@@ -3,8 +3,6 @@
- `$(BUILD_SERVER)` : the server the main builder is using to build a tor-browser release
- `$(STAGING_SERVER)` : the server the signer is using to to run the signing process
-- `$(TOR_LAUNCHER_VERSION)` : version of `tor-launcher`, used in tags
- - example : `0.2.33`
- `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc
- example : `91.6.0`
- `$(RR_VERSION)` : the Mozilla defined Rapid-Release version; Tor Browser for Android is based off of the `$(ESR_VERSION)`, but Mozilla's Firefox for Android is based off of the `$(RR_VERSION)` so we need to keep track of security vulnerabilities to backport from the monthly Rapid-Release train and our frozen ESR train.
@@ -42,16 +40,6 @@
- [ ] ***(Optional)*** Backport to maintenance branch if present and necessary
- [ ] fixup! `tor-browser`'s `Bug 10760 : Integrate TorButton to TorBrowser core` issue to point to updated `torbutton` commit
-### **tor-launcher** : https://gitlab.torproject.org/tpo/applications/tor-launcher.git
-- [ ] Update translations:
- - [ ] ./localization/import-translations.sh
- - **NOTE** : if there are no new strings imported then we are done here
-- [ ] Update `install.rdf` file with new version
-- [ ] Sign/Tag commit :
- - Tag : `$(TOR_LAUNCHER_VERSION)`
- - Message `Tagging $(TOR_LAUNCHER_VERSION)`
-- [ ] Push `main` and tag to origin
-
</details>
<details>
diff --git a/doc/MAKEFILE.txt b/doc/MAKEFILE.txt
index d577a17e..823de3b2 100644
--- a/doc/MAKEFILE.txt
+++ b/doc/MAKEFILE.txt
@@ -55,7 +55,7 @@ Create a build for Linux x86_64 with Address Sanitizer enabled.
torbrowser-{release,alpha,nightly,testbuild}-src
------------------------------------------------
-Create source tarballs for firefox, torbutton and tor-launcher.
+Create source tarballs for firefox and torbutton.
basebrowser-*
-------------
diff --git a/projects/firefox/build b/projects/firefox/build
index 8ff1b5f6..b06272f0 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -90,11 +90,6 @@ fi
patch -p1 < $rootdir/namecoin-etld.patch
[% END -%]
-[% IF c("var/tor-browser") -%]
- # Place a copy of the Tor Launcher sources under browser/extensions
- tar -C browser/extensions -xf $rootdir/[% c('input_files_by_name/tor-launcher') %]
-[% END -%]
-
[% IF c("var/namecoin") %]
pushd toolkit/torproject/torbutton
patch -p1 < $rootdir/namecoin-torbutton.patch
diff --git a/projects/firefox/config b/projects/firefox/config
index 899a2c63..a0f3bd53 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -174,9 +174,6 @@ input_files:
enable: '[% c("var/linux") %]'
- filename: start-firefox
enable: '[% c("var/linux") %]'
- - project: tor-launcher
- name: tor-launcher
- enable: '[% c("var/tor-browser") %]'
- project: translation-base-browser
name: translation-base-browser
- filename: namecoin-torbutton.patch
diff --git a/projects/release/build b/projects/release/build
index b1dc191b..15e3e86f 100644
--- a/projects/release/build
+++ b/projects/release/build
@@ -36,7 +36,6 @@ mkdir -p "$destdir"
[% END -%]
[% IF c("var/browser-src") -%]
mv [% c('input_files_by_name/src-firefox') %] \
- [% IF c("var/tor-browser"); GET c('input_files_by_name/src-tor-launcher'); END %] \
"$destdir"/
[% END -%]
cd "$destdir"
diff --git a/projects/release/config b/projects/release/config
index 8a9803f3..f3165ed8 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -211,15 +211,6 @@ input_files:
- browser-src
- '[% c("var/browser_type") %]'
- - name: src-tor-launcher
- project: tor-launcher
- enable: '[% c("var/browser-src") && c("var/tor-browser") %]'
- pkg_type: src-tarballs
- target:
- - '[% c("var/build_target") %]'
- - browser-src
- - '[% c("var/browser_type") %]'
-
steps:
signtag:
build_log: '-'
diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
deleted file mode 100644
index 710416a1..00000000
--- a/projects/tor-launcher/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-tar xvf [% project %]-[% c('version') %].tar.gz
-mv [% project %]-[% c("version") %] [% project %]
-[% c('tar', {
- tar_src => [ project ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
deleted file mode 100644
index 0b2b0b46..00000000
--- a/projects/tor-launcher/config
+++ /dev/null
@@ -1,24 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 0.2.39
-git_url: https://gitlab.torproject.org/tpo/applications/tor-launcher.git
-git_hash: '[% c("version") %]'
-gpg_keyring: torbutton.gpg
-tag_gpg_id: 1
-filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
-container:
- use_container: 1
-input_files:
- - project: container-image
-
-steps:
- src-tarballs:
- filename: 'src-[% project %]-[% c("version") %].tar.xz'
- input_files: []
- container:
- use_container: 0
-
-targets:
- nightly:
- version: '[% c("abbrev") %]'
- git_hash: main
- tag_gpg_id: 0
diff --git a/tools/signing/check_file_counts b/tools/signing/check_file_counts
index beaa8e77..a0524c8d 100755
--- a/tools/signing/check_file_counts
+++ b/tools/signing/check_file_counts
@@ -145,10 +145,7 @@ f="$(ls src-firefox-tor-browser-*.tar.xz)"
remaining_files="$(echo "${remaining_files}" | sed 's/[ ]*'"${f}"'[ ]*/ /')"
remaining_files="$(echo "${remaining_files}" | sed 's/[ ]*'"${f}.asc"'[ ]*/ /')"
-test "$(ls src-tor-launcher-*.tar.xz 2>/dev/null | wc -l)" = 1 || echo src-tor-launcher-*.tar.xz is wrong
-test "$(ls src-tor-launcher-*.tar.xz.asc 2>/dev/null | wc -l)" = 1 || echo src-tor-launcher-*.tar.xz.asc is wrong
total_count=$(( total_count + 2 ))
-f="$(ls src-tor-launcher-*.tar.xz)"
remaining_files="$(echo "${remaining_files}" | sed 's/[ ]*'"${f}"'[ ]*/ /')"
remaining_files="$(echo "${remaining_files}" | sed 's/[ ]*'"${f}.asc"'[ ]*/ /')"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits