GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit dc355882 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 25540: Don't ship sandboxed-tor-browser anymore

sandboxed-tor-browser is not maintained anymore and Yawning requested to
not ship it anymore in our alphas once we switch to Firefox 60 ESR.
parent 5e72f507
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: https://github.com/pkg/errors
git_hash: 248dadf4e9068a0b3e79f02ed0a610d935de5302
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
var:
container:
use_container: 1
go_lib: github.com/pkg/errors
input_files:
- project: container-image
- name: go
project: go
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: https://github.com/constabulary/gb
git_hash: 06cc925cce6592e922dcc4839a8b44feb384e71e
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
var:
container:
use_container: 1
go_lib: github.com/constabulary/gb
go_lib_install: github.com/constabulary/gb/cmd/gb
go_lib_deps:
- goerrors
input_files:
- project: container-image
- name: go
project: go
- name: goerrors
project: goerrors
- filename: gb-build-dir.patch
From a7b198e3a32509197150d7c2767262a7319ff339 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Tue, 6 Dec 2016 21:34:16 +0000
Subject: [PATCH] Make the gb build directory deterministic
diff --git a/context.go b/context.go
index 53c00da..d040082 100644
--- a/context.go
+++ b/context.go
@@ -3,7 +3,6 @@ package gb
import (
"fmt"
"io"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -136,7 +135,8 @@ func NewContext(p Project, opts ...func(*Context) error) (*Context, error) {
},
GcToolchain(),
}
- workdir, err := ioutil.TempDir("", "gb")
+ workdir := filepath.Join(os.TempDir(), "gb")
+ err := os.Mkdir(workdir, 0777)
if err != nil {
return nil, err
}
--
2.10.2
......@@ -20,9 +20,6 @@ mkdir -p "$destdir"
[% END -%]
[% IF c("var/torbrowser-linux-x86_64") -%]
mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/
[% IF ! c("var/release") %]
mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip
[% END %]
[% END -%]
cd "$destdir"
cat > .htaccess <<EOF
......
......@@ -87,13 +87,6 @@ input_files:
- '[% c("var/build_target") %]'
- 'torbrowser-linux-x86_64[% c("var/debug-build") %]'
- name: sandbox-linux-x86_64
project: sandbox
enable: '[% c("var/torbrowser-linux-x86_64") && ! c("var/release") %]'
target:
- '[% c("var/build_target") %]'
- torbrowser-linux-x86_64
- name: linux-i686
project: tor-browser
enable: '[% c("var/torbrowser-linux-i686") %]'
......
#!/bin/bash
[% c("var/set_default_env") -%]
[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %]
distdir=/var/tmp/dist/[% project %]
mkdir -p $distdir
tar -C /var/tmp/dist -xf [% c('input_files_by_name/gogb') %]
mkdir -p /var/tmp/build
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
cd /var/tmp/build/[% project %]-[% c('version') %]
# we don't have access to the git repository during the build
sed -i Makefile -e 's|git rev-parse --short HEAD > data/revision|echo [% c("abbrev") %] > data/revision|'
# Unset GOOS and GOARCH as they change some file names, and we don't need
# them as we are only building on x86_64
unset GOOS
unset GOARCH
make
cp bin/sandboxed-tor-browser $distdir
cd $distdir/..
[% c('zip', {
zip_src => [ project ],
zip_args => dest_dir _ '/' _ c('filename'),
}) %]
# vim: filetype=yaml sw=2
version: 0.0.16
git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser
git_hash: 'sandboxed-tor-browser-[% c("version") %]'
tag_gpg_id: 1
gpg_keyring: obfs4.gpg
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
var:
container:
use_container: 1
suite: jessie
arch: amd64
deps:
- libx11-dev
- pkg-config
- libgtk-3-dev
- libnotify-dev
- zip
targets:
nightly:
git_hash: master
version: '[% c("abbrev") %]'
tag_gpg_id: 0
input_files:
- project: container-image
- name: go
project: go
- name: gogb
project: gogb
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment