kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-01-12 22:45:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(version-info): use remote tags and increment patch version

Browse Source
This commit is contained in:
Tobias Bosch
2014-03-12 15:19:48 -07:00
parent edad4e63df
commit fe0e434a87
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/grunt/utils.js
View File

@@ -4,7 +4,6 @@ var shell = require('shelljs');
var grunt = require('grunt');
var spawn = require('child_process').spawn;
var semver = require('semver');
var versionInfo = require('../versions/version-info');
var _ = require('lodash');

24
lib/versions/version-info.js
View File

@@ -100,7 +100,10 @@ var isStable = function(version) {
* @return {Array.<SemVer>} The collection of previous versions
*/
var getPreviousVersions = function() {
var tagResults = shell.exec('git tag', {silent: true});
// always use the remote tags as the local clone might
// not contain all commits when cloned with git clone --depth=...
// Needed e.g. for Travis
var tagResults = shell.exec('git ls-remote --tags | grep -o -e "v[0-9].*[0-9]$"', {silent: true});
if ( tagResults.code === 0 ) {
return _(tagResults.output.trim().split('\n'))
.map(function(tag) {
@@ -129,7 +132,6 @@ var getPreviousVersions = function() {
* @return {SemVer} The snapshot version
*/
var getSnapshotVersion = function() {
version = _(previousVersions)
.filter(function(tag) {
return semver.satisfies(tag, currentPackage.branchVersion);
@@ -137,15 +139,27 @@ var getSnapshotVersion = function() {
.last();
if ( !version ) {
throw new Error("No valid versions can be found that match the current branch (" +
currentPackage.branchVersion + ").\n" +
"Try running `git fetch -t` to download the tags from the repository.");
// a snapshot version before the first tag on the branch
version = semver(currentPackage.branchVersion.replace('*','0-beta.1'));
}
// We need to clone to ensure that we are not modifying another version
version = semver(version.raw);
var jenkinsBuild = process.env.TRAVIS_BUILD_NUMBER || process.env.BUILD_NUMBER;
if (!version.prerelease || !version.prerelease.length) {
// last release was a non beta release. Increment the patch level to
// indicate the next release that we will be doing.
// E.g. last release was 1.3.0, then the snapshot will be
// 1.3.1-build.1, which is lesser than 1.3.1 accorind the semver!
// If the last release was a beta release we don't update the
// beta number by purpose, as otherwise the semver comparison
// does not work any more when the next beta is released.
// E.g. don't generate 1.3.0-beta.2.build.1
// as this is bigger than 1.3.0-beta.2 according to semver
version.patch++;
}
version.prerelease = jenkinsBuild ? ['build', jenkinsBuild] : ['local'];
version.build = getBuild();
version.codeName = 'snapshot';