Loading
+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ download_and_launch() {
}

merge_debian_branch() {
	local DEBIAN_GIT_URL="git://git.debian.org/pkg-privacy/packages/torbrowser-launcher.git"
	local DEBIAN_GIT_URL="https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher"
	local DEBIAN_BRANCH="debian/$1"
	echo "$(date -u) - Merging branch $DEBIAN_BRANCH into $COMMIT_HASH now."
	echo
+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@
        - '{name}_test_on_{dist}_amd64_from_git_branch_{g_i_t_branch}':
            my_description: 'Test torbrowser-launcher{my_opt_desc} on {dist}/amd64 using the branch {my_gitbranch}.'
            my_timed: '23 {my_hour} 1 * *'
            my_gitrepo: 'git://git.debian.org/pkg-privacy/packages/torbrowser-launcher.git'
            my_gitrepo: 'https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher'
            my_opt_arg: ''
            my_opt_desc: ''
            g_i_t_branch: