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.

Unverified Commit a4bbe2e5 authored by boklm's avatar boklm
Browse files

Simplify projects/release

parent 7967c75d
......@@ -30,130 +30,67 @@ targets:
release:
var:
release: 1
build_target: release
nightly:
output_dir: 'nightly'
version: '[% c("var/today") %]'
var:
nightly: 1
build_target: nightly
alpha_nightly:
output_dir: 'alpha_nightly'
version: '[% c("var/today") %]'
var:
alpha_nightly: 1
alpha: 1
build_target: alpha
alpha:
output_dir: 'alpha/unsigned'
var:
alpha: 1
build_target: alpha
hardened_nightly:
output_dir: 'hardened_nightl'
output_dir: 'hardened_nightly'
version: '[% c("var/today") %]'
var:
hardened_nightly:
hardened: 1
build_target: hardened
hardened:
output_dir: 'hardened'
var:
hardened: 1
build_target: hardened
input_files:
# Release
- name: linux-x86_64
project: tor-browser
enable: '[% c("var/torbrowser-linux-x86_64") && c("var/release") %]'
enable: '[% c("var/torbrowser-linux-x86_64") %]'
target:
- '[% c("var/build_target") %]'
- torbrowser-linux-x86_64
- name: linux-i686
project: tor-browser
enable: '[% c("var/torbrowser-linux-i686") && c("var/release") %]'
enable: '[% c("var/torbrowser-linux-i686") %]'
target:
- '[% c("var/build_target") %]'
- torbrowser-linux-i686
- name: windows-i686
project: tor-browser
enable: '[% c("var/torbrowser-windows-i686") && c("var/release") %]'
enable: '[% c("var/torbrowser-windows-i686") %]'
target:
- '[% c("var/build_target") %]'
- torbrowser-windows-i686
- name: osx-x86_64
project: tor-browser
enable: '[% c("var/torbrowser-osx-x86_64") && c("var/release") %]'
enable: '[% c("var/torbrowser-osx-x86_64") %]'
target:
- '[% c("var/build_target") %]'
- torbrowser-osx-x86_64
# Nightly
- name: linux-x86_64
project: tor-browser
enable: '[% c("var/torbrowser-linux-x86_64") && c("var/nightly") %]'
target:
- nightly
- torbrowser-linux-x86_64
- name: linux-i686
project: tor-browser
enable: '[% c("var/torbrowser-linux-i686") && c("var/nightly") %]'
target:
- nightly
- torbrowser-linux-i686
- name: windows-i686
project: tor-browser
enable: '[% c("var/torbrowser-windows-i686") && c("var/nightly") %]'
target:
- nightly
- torbrowser-windows-i686
- name: osx-x86_64
project: tor-browser
enable: '[% c("var/torbrowser-osx-x86_64") && c("var/nightly") %]'
target:
- nightly
- torbrowser-osx-x86_64
# Alpha
- name: linux-x86_64
project: tor-browser
enable: '[% c("var/torbrowser-linux-x86_64") && c("var/alpha") %]'
target:
- alpha
- torbrowser-linux-x86_64
- name: linux-i686
project: tor-browser
enable: '[% c("var/torbrowser-linux-i686") && c("var/alpha") %]'
target:
- alpha
- torbrowser-linux-i686
- name: windows-i686
project: tor-browser
enable: '[% c("var/torbrowser-windows-i686") && c("var/alpha") %]'
target:
- alpha
- torbrowser-windows-i686
- name: osx-x86_64
project: tor-browser
enable: '[% c("var/torbrowser-osx-x86_64") && c("var/alpha") %]'
target:
- alpha
- torbrowser-osx-x86_64
# Hardened
- name: linux-x86_64
project: tor-browser
enable: '[% c("var/torbrowser-linux-x86_64") && c("var/hardened") %]'
target:
- hardened
- torbrowser-linux-x86_64
build: |
#!/bin/sh
......
Subproject commit fcb46d00d791ad16b23b71c0b5b95e9b74dcb01e
Subproject commit 09ce7d45b0148173eb67369758902ceb8fd0b893
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