fastlane-plugin-wpmreleasetoolkit 2.2.0 → 2.3.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.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_betabuild_prechecks.rb +8 -2
  3. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_release.rb +11 -4
  4. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_codefreeze_prechecks.rb +10 -4
  5. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_betabuild_prechecks.rb +8 -2
  6. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_bump_version_release.rb +10 -5
  7. data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_codefreeze_prechecks.rb +10 -4
  8. data/lib/fastlane/plugin/wpmreleasetoolkit/helper/git_helper.rb +5 -0
  9. data/lib/fastlane/plugin/wpmreleasetoolkit/version.rb +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a118f64ccb017604c68c8f62c56b91d4bea3ec92f26e2942ec28caf681a811a7
4
- data.tar.gz: 4c09125195256749d839aac630c4393fab86f08363304b70b6e3d452c8aae96a
3
+ metadata.gz: a9f3fcba792147f476a814f8f67f2620b5c6740497754eb033e2919e25dd3168
4
+ data.tar.gz: 25077b056c019d26adad929b9fffbf942c23f22a60f66892905de241b624b2bb
5
5
  SHA512:
6
- metadata.gz: '04158059883cdf0a9f19077a616020fe027fc25a574d8e84605ca40d948763a33dd7373dbc526a26bc0e99f3fab4c20b38e2f10799bc2dd9bd953437fe6b7fb5'
7
- data.tar.gz: 741ea4ad0ba1b022bd856839d72c4a4847cfc0d5377c350fea687e85b685bca3cb95206e5ae6999f2c1792938966578376e58d8810cd719fc5cbf2e8c866ebcb
6
+ metadata.gz: d81b6b46eb930e0d15922c08eeea4314e9af06ef356b8dad207a6c76bec0793c1cf4e3c00507c16666170d3f6fe56960c9b3883ca567890e867fb1b50d064adf
7
+ data.tar.gz: a92daf218f3ec9094a0d26edd0f6be4a6062c83609618ccdae26980afe9efd8b10ec6e4192f73290526106f93b6b352c94e55e3944053806ea0d06548ed155c7
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_betabuild_prechecks.rb CHANGED
@@ -8,8 +8,9 @@ module Fastlane
8
8
  require_relative '../../helper/android/android_version_helper'
9
9
  require_relative '../../helper/android/android_git_helper'
10
10
 
11
- # Checkout develop and update
12
- Fastlane::Helper::GitHelper.checkout_and_pull('develop')
11
+ # Checkout default branch and update
12
+ default_branch = params[:default_branch]
13
+ Fastlane::Helper::GitHelper.checkout_and_pull(default_branch)
13
14
 
14
15
  # Check versions
15
16
  release_version = Fastlane::Helper::Android::VersionHelper.get_release_version
@@ -80,6 +81,11 @@ module Fastlane
80
81
  description: 'Skips confirmation',
81
82
  is_string: false, # true: verifies the input is a string, false: every kind of value
82
83
  default_value: false), # the default value if the user didn't provide one
84
+ FastlaneCore::ConfigItem.new(key: :default_branch,
85
+ env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',
86
+ description: 'Default branch of the repository',
87
+ type: String,
88
+ default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
83
89
  ]
84
90
  end
85
91
 
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_bump_version_release.rb CHANGED
@@ -8,7 +8,8 @@ module Fastlane
8
8
  require_relative '../../helper/android/android_version_helper'
9
9
  require_relative '../../helper/android/android_git_helper'
10
10
 
11
- other_action.ensure_git_branch(branch: 'develop')
11
+ default_branch = params[:default_branch]
12
+ other_action.ensure_git_branch(branch: default_branch)
12
13
 
13
14
  # Create new configuration
14
15
  new_short_version = Fastlane::Helper::Android::VersionHelper.bump_version_release
@@ -28,9 +29,9 @@ module Fastlane
28
29
  UI.message("New version: #{new_short_version}")
29
30
  UI.message("Release branch: #{new_release_branch}")
30
31
 
31
- # Update local develop and branch
32
+ # Update local default branch and create branch from it
32
33
  UI.message 'Creating new branch...'
33
- Fastlane::Helper::GitHelper.create_branch(new_release_branch, from: 'develop')
34
+ Fastlane::Helper::GitHelper.create_branch(new_release_branch, from: default_branch)
34
35
  UI.message 'Done!'
35
36
 
36
37
  UI.message 'Updating app version...'
@@ -52,7 +53,13 @@ module Fastlane
52
53
  end
53
54
 
54
55
  def self.available_options
55
- # Define all options your action supports.
56
+ [
57
+ FastlaneCore::ConfigItem.new(key: :default_branch,
58
+ env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',
59
+ description: 'Default branch of the repository',
60
+ type: String,
61
+ default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
62
+ ]
56
63
  end
57
64
 
58
65
  def self.output
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_codefreeze_prechecks.rb CHANGED
@@ -11,8 +11,9 @@ module Fastlane
11
11
  require_relative '../../helper/android/android_version_helper'
12
12
  require_relative '../../helper/android/android_git_helper'
13
13
 
14
- # Checkout develop and update
15
- Fastlane::Helper::GitHelper.checkout_and_pull('develop')
14
+ # Checkout default branch and update
15
+ default_branch = params[:default_branch]
16
+ Fastlane::Helper::GitHelper.checkout_and_pull(default_branch)
16
17
 
17
18
  # Create versions
18
19
  current_version = Fastlane::Helper::Android::VersionHelper.get_release_version
@@ -23,7 +24,7 @@ module Fastlane
23
24
  no_alpha_version_message = "No alpha version configured. If you wish to configure an alpha version please update version.properties to include an alpha key for this app\n"
24
25
  # Ask user confirmation
25
26
  unless params[:skip_confirm]
26
- confirm_message = "Building a new release branch starting from develop.\nCurrent version is #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
27
+ confirm_message = "Building a new release branch starting from #{default_branch}.\nCurrent version is #{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
27
28
  confirm_message += current_alpha_version.nil? ? no_alpha_version_message : "Current Alpha version is #{current_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{current_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
28
29
  confirm_message += "After codefreeze the new version will be: #{next_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{next_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
29
30
  confirm_message += current_alpha_version.nil? ? '' : "After codefreeze the new Alpha will be: #{next_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_NAME]} (#{next_alpha_version[Fastlane::Helper::Android::VersionHelper::VERSION_CODE]}).\n"
@@ -47,7 +48,7 @@ module Fastlane
47
48
  end
48
49
 
49
50
  def self.details
50
- 'Updates the develop branch, checks the app version and ensure the branch is clean'
51
+ 'Updates the default branch, checks the app version and ensure the branch is clean'
51
52
  end
52
53
 
53
54
  def self.available_options
@@ -58,6 +59,11 @@ module Fastlane
58
59
  description: 'Skips confirmation before codefreeze',
59
60
  is_string: false, # true: verifies the input is a string, false: every kind of value
60
61
  default_value: false), # the default value if the user didn't provide one
62
+ FastlaneCore::ConfigItem.new(key: :default_branch,
63
+ env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',
64
+ description: 'Default branch of the repository',
65
+ type: String,
66
+ default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
61
67
  ]
62
68
  end
63
69
 
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_betabuild_prechecks.rb CHANGED
@@ -8,8 +8,9 @@ module Fastlane
8
8
  require_relative '../../helper/ios/ios_version_helper'
9
9
  require_relative '../../helper/ios/ios_git_helper'
10
10
 
11
- # Checkout develop and update
12
- Fastlane::Helper::GitHelper.checkout_and_pull('develop')
11
+ # Checkout default branch and update
12
+ default_branch = params[:default_branch]
13
+ Fastlane::Helper::GitHelper.checkout_and_pull(default_branch)
13
14
 
14
15
  # Check versions
15
16
  build_version = Fastlane::Helper::Ios::VersionHelper.get_build_version
@@ -69,6 +70,11 @@ module Fastlane
69
70
  description: 'Skips confirmation',
70
71
  is_string: false, # true: verifies the input is a string, false: every kind of value
71
72
  default_value: false), # the default value if the user didn't provide one
73
+ FastlaneCore::ConfigItem.new(key: :default_branch,
74
+ env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',
75
+ description: 'Default branch of the repository',
76
+ type: String,
77
+ default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
72
78
  ]
73
79
  end
74
80
 
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_bump_version_release.rb CHANGED
@@ -8,16 +8,17 @@ module Fastlane
8
8
  require_relative '../../helper/ios/ios_version_helper'
9
9
  require_relative '../../helper/ios/ios_git_helper'
10
10
 
11
- other_action.ensure_git_branch(branch: 'develop')
11
+ default_branch = params[:default_branch]
12
+ other_action.ensure_git_branch(branch: default_branch)
12
13
 
13
14
  # Create new configuration
14
15
  @new_version = Fastlane::Helper::Ios::VersionHelper.bump_version_release()
15
16
  create_config()
16
17
  show_config()
17
18
 
18
- # Update local develop and branch
19
- Fastlane::Helper::GitHelper.checkout_and_pull('develop')
20
- Fastlane::Helper::GitHelper.create_branch(@new_release_branch, from: 'develop')
19
+ # Update local default branch and create branch from it
20
+ Fastlane::Helper::GitHelper.checkout_and_pull(default_branch)
21
+ Fastlane::Helper::GitHelper.create_branch(@new_release_branch, from: default_branch)
21
22
  UI.message 'Done!'
22
23
 
23
24
  UI.message 'Updating glotPressKeys...' unless params[:skip_glotpress]
@@ -64,7 +65,11 @@ module Fastlane
64
65
  description: 'Skips Deliver key update',
65
66
  is_string: false, # true: verifies the input is a string, false: every kind of value
66
67
  default_value: false), # the default value if the user didn't provide one
67
-
68
+ FastlaneCore::ConfigItem.new(key: :default_branch,
69
+ env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',
70
+ description: 'Default branch of the repository',
71
+ type: String,
72
+ default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
68
73
  ]
69
74
  end
70
75
 
data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_codefreeze_prechecks.rb CHANGED
@@ -8,8 +8,9 @@ module Fastlane
8
8
  require_relative '../../helper/ios/ios_version_helper'
9
9
  require_relative '../../helper/ios/ios_git_helper'
10
10
 
11
- # Checkout develop and update
12
- Fastlane::Helper::GitHelper.checkout_and_pull('develop')
11
+ # Checkout default branch and update
12
+ default_branch = params[:default_branch]
13
+ Fastlane::Helper::GitHelper.checkout_and_pull(default_branch)
13
14
 
14
15
  # Create versions
15
16
  current_version = Fastlane::Helper::Ios::VersionHelper.get_public_version
@@ -17,7 +18,7 @@ module Fastlane
17
18
  next_version = Fastlane::Helper::Ios::VersionHelper.calc_next_release_version(current_version)
18
19
 
19
20
  # Ask user confirmation
20
- unless params[:skip_confirm] || UI.confirm("Building a new release branch starting from develop.\nCurrent version is #{current_version} (#{current_build_version}).\nAfter codefreeze the new version will be: #{next_version}.\nDo you want to continue?")
21
+ unless params[:skip_confirm] || UI.confirm("Building a new release branch starting from #{default_branch}.\nCurrent version is #{current_version} (#{current_build_version}).\nAfter codefreeze the new version will be: #{next_version}.\nDo you want to continue?")
21
22
  UI.user_error!('Aborted by user request')
22
23
  end
23
24
 
@@ -37,7 +38,7 @@ module Fastlane
37
38
  end
38
39
 
39
40
  def self.details
40
- 'Updates the develop branch, checks the app version and ensure the branch is clean'
41
+ 'Updates the default branch, checks the app version and ensure the branch is clean'
41
42
  end
42
43
 
43
44
  def self.available_options
@@ -48,6 +49,11 @@ module Fastlane
48
49
  description: 'Skips confirmation before codefreeze',
49
50
  is_string: false, # true: verifies the input is a string, false: every kind of value
50
51
  default_value: false), # the default value if the user didn't provide one
52
+ FastlaneCore::ConfigItem.new(key: :default_branch,
53
+ env_name: 'FL_RELEASE_TOOLKIT_DEFAULT_BRANCH',
54
+ description: 'Default branch of the repository',
55
+ type: String,
56
+ default_value: Fastlane::Helper::GitHelper::DEFAULT_GIT_BRANCH),
51
57
  ]
52
58
  end
53
59
 
data/lib/fastlane/plugin/wpmreleasetoolkit/helper/git_helper.rb CHANGED
@@ -5,6 +5,11 @@ module Fastlane
5
5
  # Helper methods to execute git-related operations
6
6
  #
7
7
  module GitHelper
8
+ # Fallback default branch of the client repository. It's currently set to 'develop' for
9
+ # backwards compatibility.
10
+ # TODO: Set to 'trunk' for the next major release.
11
+ DEFAULT_GIT_BRANCH = 'develop'.freeze
12
+
8
13
  # Checks if the given path, or current directory if no path is given, is
9
14
  # inside a Git repository
10
15
  #
data/lib/fastlane/plugin/wpmreleasetoolkit/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Fastlane
2
2
  module Wpmreleasetoolkit
3
- VERSION = '2.2.0'
3
+ VERSION = '2.3.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fastlane-plugin-wpmreleasetoolkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0
4
+ version: 2.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lorenzo Mattei
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-12-13 00:00:00.000000000 Z
11
+ date: 2021-12-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: diffy