travis: fix dev version number, stage ordering and add 17.04 upload #48

Merged
merged 4 commits into from Nov 24, 2017

Conversation

3 participants
Owner

Saviq commented Nov 23, 2017

No description provided.

Saviq added some commits Nov 23, 2017

@Saviq Saviq requested a review from AlanGriffiths Nov 23, 2017

Contributor

AlanGriffiths commented Nov 23, 2017

bors r+

bors bot pushed a commit that referenced this pull request Nov 23, 2017

Merge #48
48: travis: fix stage ordering and add 17.04 upload r=AlanGriffiths a=Saviq

bors bot commented Nov 23, 2017

Canceled

tools/dev-upload.sh
@@ -10,7 +10,7 @@ fi
MIR_VERSION=$( dpkg-parsechangelog --show-field Version \
| perl -n -e '/(^[^~-]+)/ && print $1' )
-GIT_COMMITS=$( git rev-list --count HEAD )
+GIT_COMMITS=$( git rev-list --count `git rev-parse --abbrev-ref HEAD@{u}` )
@Saviq

Saviq Nov 23, 2017

Owner

This reads the commit count in the remote branch tracked by HEAD, regardless of what's checked out.

@Saviq

Saviq Nov 23, 2017

Owner

Actually that's not true. It still only works on what's fetched. :/

@@ -50,6 +50,6 @@ debchange \
--distribution ${UBUNTU_SERIES} \
"Build for Ubuntu ${UBUNTU_VERSION}"
-dpkg-buildpackage -d -S
+dpkg-buildpackage -I -i -d -S
@Saviq

Saviq Nov 23, 2017

Owner

From man dpkg-source:

The -i option by itself enables this setting with a default regex (preserving any modification to the default regex done by a previous use of --extend-diff-ignore) that will filter out control files and directories of the most common revision control systems, backup and swap files and Libtool build output directories. There can only be one active regex, of multiple -i options only the last one will take effect.

-I by itself adds default --exclude options that will filter out control files and directories of the most common revision control systems, backup and swap files and Libtool build output directories.

@Saviq Saviq changed the title from travis: fix stage ordering and add 17.04 upload to travis: fix dev version number, stage ordering and add 17.04 upload Nov 23, 2017

@Saviq Saviq requested a review from RAOF Nov 23, 2017

RAOF approved these changes Nov 23, 2017

LGTM.

bors r+

bors bot pushed a commit that referenced this pull request Nov 23, 2017

Merge #48
48: travis: fix dev version number, stage ordering and add 17.04 upload r=RAOF a=Saviq
Owner

Saviq commented Nov 23, 2017

bors r-

:/

bors bot commented Nov 23, 2017

Canceled

travis: unshallow the clone before uploading to dev
Otherwise we don't have a reliable source of version numbers.

RAOF approved these changes Nov 23, 2017

All because git was too cool to have a revno…

bors r+

bors bot pushed a commit that referenced this pull request Nov 23, 2017

Merge #48
48: travis: fix dev version number, stage ordering and add 17.04 upload r=RAOF a=Saviq
Owner

Saviq commented Nov 24, 2017

network issues

bors r=RAOF

bors bot pushed a commit that referenced this pull request Nov 24, 2017

Merge #48
48: travis: fix dev version number, stage ordering and add 17.04 upload r=RAOF a=Saviq

@bors bors bot merged commit 4336905 into master Nov 24, 2017

2 checks passed

bors Build succeeded
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Saviq Saviq deleted the staging-ppa branch Nov 24, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment