Commit graph

17 commits

Author SHA1 Message Date
Sebastian Kuzminsky
efc3491786 githelper: made new 2.8 branch, master is now 2.9~pre 2019-06-02 16:45:35 -06:00
Sebastian Kuzminsky
1403f9673b Merge remote-tracking branch 'origin/2.7'
Conflicts:
	VERSION
	debian/changelog
2014-10-26 23:16:32 -06:00
Sebastian Kuzminsky
7261c9ec72 Merge remote-tracking branch 'origin/2.6' into 2.7 2014-10-21 23:36:36 -06:00
Sebastian Kuzminsky
d024544d11 Add a gnupg keyring for release tag signature verification
Add a gnupg keyring containing just the public part of the keypair used
to sign release tags.

Also change the githelper script to use the keyring in the git repo
instead of the one in the caller's home directory.

Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
2014-10-21 22:48:40 -05:00
Sebastian Kuzminsky
dcf6f1cf04 githelper: better tag glob for master
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
2014-10-21 17:14:00 -05:00
Sebastian Kuzminsky
b954ad3e07 oops, bump the master tag glob
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
2014-10-21 14:42:21 -05:00
Sebastian Kuzminsky
e5d5e5871a teach the build scripts to be more accepting of release branch names
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
2014-10-21 14:30:01 -05:00
Sebastian Kuzminsky
822a3ab114 bump version number of master to 2.7.0-pre0 2014-04-18 23:08:09 -06:00
Sebastian Kuzminsky
63f571ff71 teach githelper about the 2.6 branch 2014-04-02 00:48:30 -06:00
Sebastian Kuzminsky
95f9603c01 put error messages back on stderr, where they belong
My previous panicked change broke the git helper script, by inadvertently
moving some error messages from stderr to stdout.

The problem *doesn't* manifest if the user who runs the script has Jeff
Epler's or Chris Radek's pubkeys in their key ring, like I do.

The problem *does* manifest if neither of those keys are in the user's
key ring, like on one of the buildbot machines.

This commit puts the error messages back where they belong.
2012-04-01 12:56:51 -06:00
Chris Radek
eea3b99b90 check for tags in a better way 2012-03-31 15:32:54 -05:00
Sebastian Kuzminsky
8c09addcb2 build system: add git-branch to deb-component mapping
If i tell you what branch i'm on, you tell me which debian archive
component to put the packages in.  This feature is useful for automation
that builds emc2 and makes debian archives (buildbot, i'm looking at you).

We used to always use the branch name as the component name, for example
the v2.4_branch debs went into the v2.4_branch-{sim,rt} components.
This falls short if you want to do test builds of throw-away branches,
because the binary deb builders don't know the name of your branch, so
they don't know where to find the source debs.  This commit puts all
unknown branches into a new component named "scratch", so the binary
deb builders' sources.list doesn't have to know all the branch names.
2011-12-15 09:18:40 -07:00
Sebastian Kuzminsky
7c6c53f493 build system: reindent for clarity
No code changes.
2011-12-15 09:18:35 -07:00
Sebastian Kuzminsky
e1bed62e51 build system: fix a comment to match reality 2011-12-15 09:18:19 -07:00
Sebastian Kuzminsky
05969ba53e whoops, accept the signed tag if we find one! 2011-09-21 16:15:22 -06:00
Sebastian Kuzminsky
c2fd32af16 packaging: make githelper set GIT_TAG always
That is, even if it can't verify tag signatures.  I don't like it,
but it's not worse than what we had before.
2011-09-21 16:02:21 -06:00
Sebastian Kuzminsky
528d4ef049 packaging: add some scripts for working with git
This commit does these things:

    * Add a small shell library called githelper.sh, which reads a bunch
      of info from git and makes it available as environment variables
      in the caller.

    * Add a script called version-is-release, which checks to see if
      the current version (HEAD) has a signed release tag pointing to it.

    * Update update-dch-from-git and get-version-from-git to use the
      new githelper library, for consistency.
2011-09-21 15:32:26 -06:00