papa 1.1.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/papa/task/common/add.rb +1 -0
- data/lib/papa/task/integration/add.rb +1 -0
- data/lib/papa/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 853034b608141d86767408b88093c750a314199e
|
4
|
+
data.tar.gz: 899e6af3f7a610394844ab316fc2929156c4723b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 61f9aecb052ade89db1f3ff70bca4e6ae8745a86977ca7c3e35f45d69726f512c5dd36a9750765094a137b84b6a970371a8700fabd4ad3ab2693051ed929c4df
|
7
|
+
data.tar.gz: b3a77c180a79c9f20445432a007358880909916183ff01781a4ae7e8fde1e3b0cb48000c89dddb08cdf0db09825113ecd67aae78ac7023effef5aa355d2f7549
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,9 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## 1.2.0
|
4
|
+
* Allow adding release branches to integration branches
|
5
|
+
* Hard reset build branch for integration-related tasks
|
6
|
+
|
3
7
|
## 1.1.0
|
4
8
|
* Allow merging release branches to other branches upon finishing by adding `-b` to `papa release finish`
|
5
9
|
* Upon starting a new release or hotfix branch, reset base branch from origin after checking out
|
data/lib/papa/task/common/add.rb
CHANGED
@@ -14,6 +14,7 @@ module Papa
|
|
14
14
|
def queue(branch)
|
15
15
|
[
|
16
16
|
Command::Git::Checkout.new(build_branch),
|
17
|
+
Command::Git::ResetHard.new('origin', build_branch),
|
17
18
|
Command::Git::Checkout.new(branch),
|
18
19
|
Command::Git::ResetHard.new('origin', branch),
|
19
20
|
Command::Git::Rebase.new(build_branch),
|
data/lib/papa/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: papa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- boggs
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-09-
|
11
|
+
date: 2018-09-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|