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 5a438172 authored by boklm's avatar boklm
Browse files

Add script to help tagging a release

The 'make signtag-release' and 'make signtag-alpha' commands can be
used to tag a stable or alpha release using the version informations
from rbm.conf.
parent c87cfc72
...@@ -80,6 +80,12 @@ testbuild-osx-x86_64: submodule-update ...@@ -80,6 +80,12 @@ testbuild-osx-x86_64: submodule-update
hardened-linux-x86_64: submodule-update hardened-linux-x86_64: submodule-update
$(rbm) build release --target hardened --target torbrowser-linux-x86_64 $(rbm) build release --target hardened --target torbrowser-linux-x86_64
signtag-release: submodule-update
$(rbm) build release --step signtag --target release
signtag-alpha: submodule-update
$(rbm) build release --step signtag --target alpha
submodule-update: submodule-update:
git submodule update --init git submodule update --init
......
...@@ -117,3 +117,9 @@ input_files: ...@@ -117,3 +117,9 @@ input_files:
- torbrowser-windows-i686 - torbrowser-windows-i686
- expert-bundle - expert-bundle
steps:
signtag:
build_log: '-'
debug: 0
input_files: []
signtag: '[% INCLUDE signtag %]'
#!/bin/bash
[% c("var/set_default_env") -%]
# reset HOME which was changed by var/set_default_env, for gpg/git
[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %]
cd [% c("basedir") %]
git tag [% c("buildconf/git_signtag_opt") %] -m \
'Tagging [% c("var/torbrowser_build") %] for [% c("var/torbrowser_version") %]' \
tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]
rbm @ 31be4786
Subproject commit ff4299fcf372aef5d28fe7024a60d81d413fcd6f Subproject commit 31be478688e0448d36373d21939922f2a108aeea
...@@ -11,6 +11,7 @@ pkg_type: build ...@@ -11,6 +11,7 @@ pkg_type: build
# in var/build_id, so that changing this option does not affect the build_id. # in var/build_id, so that changing this option does not affect the build_id.
buildconf: buildconf:
num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]'
git_signtag_opt: '-s'
var: var:
torbrowser_version: '7.5a4' torbrowser_version: '7.5a4'
......
...@@ -29,6 +29,11 @@ buildconf: ...@@ -29,6 +29,11 @@ buildconf:
### RBM_NUM_PROCS environment variable. The default is 4. ### RBM_NUM_PROCS environment variable. The default is 4.
#num_procs: 8 #num_procs: 8
### The buildconf/git_signtag_opt option is useful when you tag a release.
### It is used to set the 'git tag' argument to select the keyid for
### signing the tag.
#git_signtag_opt: '-u keyid'
var: var:
local_conf: 1 local_conf: 1
......
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