Browse Source

fix travis

Daniel Zlotin 7 years ago
parent
commit
6ef95a4085
2 changed files with 2 additions and 4 deletions
  1. 0
    3
      .travis.yml
  2. 2
    1
      scripts/release.js

+ 0
- 3
.travis.yml View File

13
   - master
13
   - master
14
   - v2
14
   - v2
15
 
15
 
16
-git:
17
-  depth: 9999999
18
-
19
 before_cache:
16
 before_cache:
20
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
17
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
21
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
18
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

+ 2
- 1
scripts/release.js View File

38
 function calcNewVersion() {
38
 function calcNewVersion() {
39
   const packageVersion = semver.clean(process.env.npm_package_version);
39
   const packageVersion = semver.clean(process.env.npm_package_version);
40
   console.log(`package version: ${packageVersion}`);
40
   console.log(`package version: ${packageVersion}`);
41
+  exec.execSync(`git fetch`);
41
   const commitCount = exec.execSyncRead(`git rev-list --count ${ONLY_ON_BRANCH}`);
42
   const commitCount = exec.execSyncRead(`git rev-list --count ${ONLY_ON_BRANCH}`);
42
-  console.log(`new patch: ${commitCount}`);
43
+  console.log(`commits in ${ONLY_ON_BRANCH}: ${commitCount}`);
43
   return `${semver.major(packageVersion)}.${semver.minor(packageVersion)}.${commitCount}`;
44
   return `${semver.major(packageVersion)}.${semver.minor(packageVersion)}.${commitCount}`;
44
 }
45
 }
45
 
46