v2gpti 0.2.0.5 → 0.2.0.6
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 247e49b51d804014bf6e0f1c779a21ffc505197c
|
4
|
+
data.tar.gz: 7f2bdb3539b7a6a28098429df5322adbca41aa3e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e7b6eec3f278b53223f0e76443abc07957c521bdff3865f20f0d26319f767eac420a8f9c4e119f09b1609c6d308a589019016a1d35abd9feb0e7a57ebd3eebb2
|
7
|
+
data.tar.gz: 0c281281e883c0f913053ef1fac341d86347136e5072951a6ab59581c2402b893763eddaa26931f916172f32058190eece3d84da31def3cc5c279f7e495e8b3f
|
@@ -41,15 +41,15 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
|
|
41
41
|
|
42
42
|
# checkout QA branch
|
43
43
|
# Update QA from origin
|
44
|
-
GitPivotalTrackerIntegration::Util::Shell.exec "git checkout QA"
|
45
|
-
GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
|
46
|
-
GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs QA"
|
44
|
+
puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout QA"
|
45
|
+
puts GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
|
46
|
+
puts GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs origin QA"
|
47
47
|
|
48
48
|
# checkout master branch
|
49
49
|
# Merge QA into master
|
50
|
-
GitPivotalTrackerIntegration::Util::Shell.exec "git checkout master"
|
51
|
-
GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
|
52
|
-
if (GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs
|
50
|
+
puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout master"
|
51
|
+
puts GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
|
52
|
+
if (GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs QA")
|
53
53
|
puts "Merged 'QA' in to 'master'"
|
54
54
|
else
|
55
55
|
abort "FAILED to merge 'QA' in to 'master'"
|
@@ -75,7 +75,7 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
|
|
75
75
|
Dir.chdir(working_directory)
|
76
76
|
|
77
77
|
# Create a new build commit, push to QA, checkout develop
|
78
|
-
GitPivotalTrackerIntegration::Util::Git.create_commit( "Update
|
78
|
+
puts GitPivotalTrackerIntegration::Util::Git.create_commit( "Update version number to #{version_number} for delivery to QA", story)
|
79
79
|
puts GitPivotalTrackerIntegration::Util::Shell.exec "git push"
|
80
80
|
puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout #{current_branch}"
|
81
81
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: v2gpti
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.0.
|
4
|
+
version: 0.2.0.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ben Hale
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-05-
|
12
|
+
date: 2014-05-30 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: highline
|