Skip to content

Commit 09ea28a

Browse files
committed
Rename "Installable Build" to "Prototype Build"
1 parent 2e4dba8 commit 09ea28a

File tree

5 files changed

+41
-42
lines changed

5 files changed

+41
-42
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ echo "--- :closed_lock_with_key: Installing Secrets"
77
bundle exec fastlane run configure_apply
88

99
echo "--- :hammer_and_wrench: Building"
10-
bundle exec fastlane "build_and_upload_$1_installable_build"
10+
bundle exec fastlane "build_and_upload_$1_prototype_build"

.buildkite/pipeline.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,16 @@ steps:
9595
- "**/build/instrumented-tests/**/*"
9696

9797
#################
98-
# Create Installable Builds for WP and JP
98+
# Create Prototype Builds for WP and JP
9999
#################
100-
- group: "📲 Installable Builds"
100+
- group: "📲 Prototype Builds"
101101
steps:
102-
- label: ":wordpress: :android: Installable Build"
103-
command: ".buildkite/commands/installable-build.sh wordpress"
102+
- label: ":wordpress: :android: Prototype Build"
103+
command: ".buildkite/commands/prototype-build.sh wordpress"
104104
if: build.pull_request.id != null
105105
plugins: *common_plugins
106106

107-
- label: ":jetpack: :android: Installable Build"
108-
command: ".buildkite/commands/installable-build.sh jetpack"
107+
- label: ":jetpack: :android: Prototype Build"
108+
command: ".buildkite/commands/prototype-build.sh jetpack"
109109
if: build.pull_request.id != null
110110
plugins: *common_plugins

WordPress/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ android {
7171
applicationId "org.wordpress.android"
7272
archivesBaseName = "$applicationId"
7373

74-
versionName project.findProperty("installableBuildVersionName") ?: versionProperties.getProperty("versionName")
74+
versionName project.findProperty("prototypeBuildVersionName") ?: versionProperties.getProperty("versionName")
7575
versionCode versionProperties.getProperty("versionCode").toInteger()
7676

7777
minSdkVersion rootProject.minSdkVersion
@@ -220,8 +220,7 @@ android {
220220
dimension "buildType"
221221
}
222222

223-
// Used for CI builds on PRs (aka "Installable Builds"). Can be used locally when a developer needs
224-
// to install multiple versions of the app on the same device.
223+
// Used for CI builds on PRs (aka "Prototype Builds"). Can be used locally when a developer needs to install multiple versions of the app on the same device.
225224
// AppName: WordPress Pre-Alpha/Jetpack Pre-Alpha
226225
jalapeno {
227226
isDefault true

fastlane/Fastfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ APP_SPECIFIC_VALUES = {
2525

2626
UPLOAD_TO_PLAY_STORE_JSON_KEY = File.join(Dir.home, '.configure', 'wordpress-android', 'secrets', 'google-upload-credentials.json')
2727

28-
INSTALLABLE_BUILD_FLAVOR = 'Jalapeno'.freeze
29-
INSTALLABLE_BUILD_TYPE = 'Debug'.freeze
30-
INSTALLABLE_BUILD_DOMAIN = 'https://d2twmm2nzpx3bg.cloudfront.net'
28+
PROTOTYPE_BUILD_FLAVOR = 'Jalapeno'.freeze
29+
PROTOTYPE_BUILD_TYPE = 'Debug'.freeze
30+
PROTOTYPE_BUILD_DOMAIN = 'https://d2twmm2nzpx3bg.cloudfront.net'
3131

3232
PROJECT_ROOT_FOLDER = File.dirname(File.expand_path(__dir__))
3333
FASTLANE_FOLDER = File.join(PROJECT_ROOT_FOLDER, 'fastlane')

fastlane/lanes/build.rb

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -135,49 +135,49 @@
135135
end
136136

137137
#####################################################################################
138-
# build_and_upload_installable_build
138+
# build_and_upload_wordpress_prototype_build
139139
# -----------------------------------------------------------------------------------
140-
# Build a WordPress Installable Build and make it available for download
140+
# Build a WordPress Prototype Build and make it available for download
141141
# -----------------------------------------------------------------------------------
142142
# Usage:
143-
# bundle exec fastlane build_and_upload_installable_build
143+
# bundle exec fastlane build_and_upload_wordpress_prototype_build
144144
#####################################################################################
145-
desc 'Build an Installable Build and make it available for download'
146-
lane :build_and_upload_wordpress_installable_build do
145+
desc 'Build a WordPress Prototype Build and make it available for download'
146+
lane :build_and_upload_wordpress_prototype_build do
147147
UI.user_error!("'BUILDKITE_ARTIFACTS_S3_BUCKET' must be defined as an environment variable.") unless ENV['BUILDKITE_ARTIFACTS_S3_BUCKET']
148148

149-
versionName = generate_installable_build_number
149+
versionName = generate_prototype_build_number
150150
gradle(
151151
task: 'assemble',
152-
flavor: "WordPress#{INSTALLABLE_BUILD_FLAVOR}",
153-
build_type: INSTALLABLE_BUILD_TYPE,
154-
properties: { installableBuildVersionName: versionName }
152+
flavor: "WordPress#{PROTOTYPE_BUILD_FLAVOR}",
153+
build_type: PROTOTYPE_BUILD_TYPE,
154+
properties: { prototypeBuildVersionName: versionName }
155155
)
156156

157-
upload_installable_build(product: 'WordPress', versionName: versionName)
157+
upload_prototype_build(product: 'WordPress', versionName: versionName)
158158
end
159159

160160
#####################################################################################
161-
# build_and_upload_jetpack_installable_build
161+
# build_and_upload_jetpack_prototype_build
162162
# -----------------------------------------------------------------------------------
163-
# Build a Jetpack Installable Build and make it available for download
163+
# Build a Jetpack Prototype Build and make it available for download
164164
# -----------------------------------------------------------------------------------
165165
# Usage:
166-
# bundle exec fastlane build_and_upload_installable_build
166+
# bundle exec fastlane build_and_upload_jetpack_prototype_build
167167
#####################################################################################
168-
desc 'Build an Installable Build and make it available for download'
169-
lane :build_and_upload_jetpack_installable_build do
168+
desc 'Build a Jetpack Prototype Build and make it available for download'
169+
lane :build_and_upload_jetpack_prototype_build do
170170
UI.user_error!("'BUILDKITE_ARTIFACTS_S3_BUCKET' must be defined as an environment variable.") unless ENV['BUILDKITE_ARTIFACTS_S3_BUCKET']
171171

172-
versionName = generate_installable_build_number
172+
versionName = generate_prototype_build_number
173173
gradle(
174174
task: 'assemble',
175-
flavor: "Jetpack#{INSTALLABLE_BUILD_FLAVOR}",
176-
build_type: INSTALLABLE_BUILD_TYPE,
177-
properties: { installableBuildVersionName: versionName }
175+
flavor: "Jetpack#{PROTOTYPE_BUILD_FLAVOR}",
176+
build_type: PROTOTYPE_BUILD_TYPE,
177+
properties: { prototypeBuildVersionName: versionName }
178178
)
179179

180-
upload_installable_build(product: 'Jetpack', versionName: versionName)
180+
upload_prototype_build(product: 'Jetpack', versionName: versionName)
181181
end
182182

183183
#####################################################################################
@@ -248,8 +248,8 @@
248248
#
249249
# @param [String] product the display name of the app to upload to S3. 'WordPress' or 'Jetpack'
250250
#
251-
def upload_installable_build(product:, versionName:)
252-
filename = "#{product.downcase}-installable-build-#{generate_installable_build_number}.apk"
251+
def upload_prototype_build(product:, versionName:)
252+
filename = "#{product.downcase}-prototype-build-#{versionName}.apk"
253253

254254
upload_path = upload_to_s3(
255255
bucket: 'a8c-apps-public-artifacts',
@@ -260,32 +260,32 @@ def upload_installable_build(product:, versionName:)
260260

261261
return if ENV['BUILDKITE_PULL_REQUEST'].nil?
262262

263-
install_url = "#{INSTALLABLE_BUILD_DOMAIN}/#{upload_path}"
263+
install_url = "#{PROTOTYPE_BUILD_DOMAIN}/#{upload_path}"
264264
comment_body = prototype_build_details_comment(
265265
app_display_name: product,
266266
app_icon: ":#{product.downcase}:", # Use Buildkite emoji based on product name
267267
download_url: install_url,
268-
metadata: { Flavor: INSTALLABLE_BUILD_FLAVOR, 'Build Type': INSTALLABLE_BUILD_TYPE },
268+
metadata: { Flavor: PROTOTYPE_BUILD_FLAVOR, 'Build Type': PROTOTYPE_BUILD_TYPE },
269269
footnote: '<em>Note: Google Login is not supported on these builds.</em>',
270270
fold: true
271271
)
272272

273273
comment_on_pr(
274274
project: GHHELPER_REPO,
275275
pr_number: Integer(ENV['BUILDKITE_PULL_REQUEST']),
276-
reuse_identifier: "#{product.downcase}-installable-build-link",
276+
reuse_identifier: "#{product.downcase}-prototype-build-link",
277277
body: comment_body
278278
)
279279

280280
if ENV['BUILDKITE']
281-
message = "#{product} Installable Build: [#{filename}](#{install_url})"
282-
buildkite_annotate(style: 'info', context: "installable-build-#{product}", message: message)
283-
buildkite_metadata(set: { versionName: versionName, 'build:flavor': INSTALLABLE_BUILD_FLAVOR, 'build:type': INSTALLABLE_BUILD_TYPE })
281+
message = "#{product} Prototype Build: [#{filename}](#{install_url})"
282+
buildkite_annotate(style: 'info', context: "prototype-build-#{product}", message: message)
283+
buildkite_metadata(set: { versionName: versionName, 'build:flavor': PROTOTYPE_BUILD_FLAVOR, 'build:type': PROTOTYPE_BUILD_TYPE })
284284
end
285285
end
286286

287287
# This function is Buildkite-specific
288-
def generate_installable_build_number
288+
def generate_prototype_build_number
289289
if ENV['BUILDKITE']
290290
commit = ENV['BUILDKITE_COMMIT'][0, 7]
291291
branch = ENV['BUILDKITE_BRANCH'].parameterize

0 commit comments

Comments
 (0)