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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ce70540dead41684251bf8b645acbef540c4ae70
4
- data.tar.gz: 91f2e872e23ada8658d1a838aab027dff320eb14
3
+ metadata.gz: 853034b608141d86767408b88093c750a314199e
4
+ data.tar.gz: 899e6af3f7a610394844ab316fc2929156c4723b
5
5
  SHA512:
6
- metadata.gz: 3ebb3b43866d7b6d662b32a2f44c27fb654588decc8df2a0e54d5857e979421366e359d9dfbb55e48b3f70a9a06615a1dfc07312dd315e933c1e460a69beae64
7
- data.tar.gz: 6356f191cce45628d6f4cd8a09fe631ab1bd53a8201d483579a9ba7d95dccb25d887accb29e69f85c3882ae1713a491096bd2f0c82485d1c1d4430608ed7ac88
6
+ metadata.gz: 61f9aecb052ade89db1f3ff70bca4e6ae8745a86977ca7c3e35f45d69726f512c5dd36a9750765094a137b84b6a970371a8700fabd4ad3ab2693051ed929c4df
7
+ data.tar.gz: b3a77c180a79c9f20445432a007358880909916183ff01781a4ae7e8fde1e3b0cb48000c89dddb08cdf0db09825113ecd67aae78ac7023effef5aa355d2f7549
@@ -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
@@ -28,6 +28,7 @@ module Papa
28
28
  end
29
29
 
30
30
  def check_if_branches_are_valid
31
+ return if @build_type == 'integration'
31
32
  invalid_branch_prefixes = ['hotfix', 'release']
32
33
  @branches.each do |branch|
33
34
  has_invalid_branches = invalid_branch_prefixes.any? do |invalid_branch_prefix|
@@ -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),
@@ -1,3 +1,3 @@
1
1
  module Papa
2
- VERSION = '1.1.0'
2
+ VERSION = '1.2.0'
3
3
  end
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.1.0
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-03 00:00:00.000000000 Z
11
+ date: 2018-09-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor