Add WordPress and Jetpack Installable Builds

.buildkite/commands/jetpack-installable-build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -eu
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :hammer_and_wrench: Building"
+bundle exec fastlane build_and_upload_jetpack_installable_build

.buildkite/commands/wordpress-installable-build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -eu
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :hammer_and_wrench: Building"
+bundle exec fastlane build_and_upload_wordpress_installable_build

.buildkite/pipeline.yml

@@ -12,8 +12,6 @@ steps:
     plugins: *common_plugins
     artifact_paths:
       - "**/build/reports/checkstyle/checkstyle.*"
-    agents:
-      queue: "android"
 
   - label: "ktlint"
     command: |
@@ -22,8 +20,6 @@ steps:
     plugins: *common_plugins
     artifact_paths:
       - "**/build/ktlint.xml"
-    agents:
-      queue: "android"
 
   - label: "detekt"
     command: |
@@ -32,8 +28,6 @@ steps:
     plugins: *common_plugins
     artifact_paths:
       - "**/build/reports/detekt/detekt.html"
-    agents:
-      queue: "android"
 
   - label: "lint"
     command: |
@@ -42,29 +36,31 @@ steps:
     plugins: *common_plugins
     artifact_paths:
       - "**/build/reports/lint-results*.*"
-    agents:
-      queue: "android"
 
   - label: "Test WordPress"
     command: |
       cp gradle.properties-example gradle.properties
       ./gradlew testWordpressVanillaRelease
     plugins: *common_plugins
-    agents:
-      queue: "android"
 
   - label: "Test WordPressProcessors"
     command: |
       cp gradle.properties-example gradle.properties
       ./gradlew :libs:WordPressProcessors:test
     plugins: *common_plugins
-    agents:
-      queue: "android"
 
   - label: "Test ImageEditor"
     command: |
       cp gradle.properties-example gradle.properties
       ./gradlew :libs:image-editor:ImageEditor:test
     plugins: *common_plugins
-    agents:
-      queue: "android"
+
+  - label: "🛠 WordPress Installable Build"
+    command: ".buildkite/commands/wordpress-installable-build.sh"
+    if: build.pull_request.id != null
+    plugins: *common_plugins
+
+  - label: "🛠 Jetpack Installable Build"
+    command: ".buildkite/commands/jetpack-installable-build.sh"
+    if: build.pull_request.id != null
+    plugins: *common_plugins

.circleci/config.yml

@@ -31,47 +31,6 @@ commands:
 
 version: 2.1
 jobs:
-  Installable Build:
-    executor:
-      name: android/default
-      api-version: "29"
-    steps:
-      - git/shallow-checkout
-      - bundle-install/bundle-install:
-          cache_key_prefix: installable-build-v4
-      - run:
-          name: Copy Secrets
-          command: FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane run configure_apply
-      - update-gradle-memory
-      - android/restore-gradle-cache
-      - run:
-          name: Set version environment variable
-          command: |
-            if [ -n "$CIRCLE_PULL_REQUEST" ]; then
-              PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST)
-              PREFIX="pr-${PR_NUMBER}"
-            else
-              PREFIX="$CIRCLE_BRANCH"
-            fi
-
-            VERSION_NAME="${PREFIX}-build-${CIRCLE_BUILD_NUM}"
-            echo "export VERSION_NAME=$VERSION_NAME" >> $BASH_ENV
-      - run:
-          name: Build WordPress APK
-          command: ./gradlew --stacktrace assembleWordpressJalapenoDebug -PinstallableBuildVersionName="$VERSION_NAME"
-      - run:
-          name: Build Jetpack APK
-          command: ./gradlew --stacktrace assembleJetpackJalapenoDebug -PinstallableBuildVersionName="$VERSION_NAME"
-      - android/save-gradle-cache
-      - run:
-          name: Prepare APK
-          command: |
-            mkdir -p Artifacts
-            mv WordPress/build/outputs/apk/wordpressJalapeno/debug/org.wordpress.android-wordpress-jalapeno-debug.apk "Artifacts/WordPress-${VERSION_NAME}.apk"
-            mv WordPress/build/outputs/apk/jetpackJalapeno/debug/org.wordpress.android-jetpack-jalapeno-debug.apk "Artifacts/Jetpack-${VERSION_NAME}.apk"
-      - store_artifacts:
-          path: Artifacts
-          destination: Artifacts
   Release Build:
     parameters:
       alpha:
@@ -361,10 +320,6 @@ workflows:
         - << pipeline.parameters.release_build >>
     jobs:
       - Dependency Tree Diff
-      - Installable Build:
-          filters:
-            branches:
-              ignore: /pull\/[0-9]+/
       - Connected Tests:
           post-to-slack: true
           # Always run connected tests on trunk and release branches

fastlane/Fastfile

@@ -16,6 +16,7 @@ APP_SPECIFIC_VALUES = {
 }.freeze
 
 UPLOAD_TO_PLAY_STORE_JSON_KEY = File.join(Dir.home, '.configure', 'wordpress-android', 'secrets', 'google-upload-credentials.json')
+INSTALLABLE_BUILD_DOMAIN = 'https://d2twmm2nzpx3bg.cloudfront.net'
 
 ########################################################################
 # Environment

fastlane/Pluginfile

@@ -6,5 +6,5 @@ group :screenshots, optional: true do
   gem 'rmagick', '~> 4.1'
 end
 
-gem 'fastlane-plugin-wpmreleasetoolkit', git: 'git@github.com:wordpress-mobile/release-toolkit.git', branch: 'trunk'
-# gem 'fastlane-plugin-wpmreleasetoolkit', '~> 4.1'
+#gem 'fastlane-plugin-wpmreleasetoolkit', git: 'git@github.com:wordpress-mobile/release-toolkit.git', branch: 'trunk'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 4.1'

fastlane/lanes/build.rb

@@ -203,6 +203,50 @@
     end
   end
 
+  #####################################################################################
+  # build_and_upload_installable_build
+  # -----------------------------------------------------------------------------------
+  # Build a WordPress Installable Build and make it available for download
+  # -----------------------------------------------------------------------------------
+  # Usage:
+  # bundle exec fastlane build_and_upload_installable_build
+  #####################################################################################
+  desc "Build an Installable Build and make it available for download"
+  lane :build_and_upload_wordpress_installable_build do | options |
+
+    UI.user_error!("'BUILDKITE_ARTIFACTS_S3_BUCKET' must be defined as an environment variable.") unless ENV['BUILDKITE_ARTIFACTS_S3_BUCKET']
+
+    gradle(
+      task: "assemble",
+      flavor: "WordPressJalapeno",
+      build_type: "Debug"
+    )
+
+    upload_installable_build(product: 'WordPress')
+  end
+
+  #####################################################################################
+  # build_and_upload_jetpack_installable_build
+  # -----------------------------------------------------------------------------------
+  # Build a Jetpack Installable Build and make it available for download
+  # -----------------------------------------------------------------------------------
+  # Usage:
+  # bundle exec fastlane build_and_upload_installable_build
+  #####################################################################################
+  desc "Build an Installable Build and make it available for download"
+  lane :build_and_upload_jetpack_installable_build do | options |
+
+    UI.user_error!("'BUILDKITE_ARTIFACTS_S3_BUCKET' must be defined as an environment variable.") unless ENV['BUILDKITE_ARTIFACTS_S3_BUCKET']
+
+    gradle(
+      task: "assemble",
+      flavor: "JetpackJalapeno",
+      build_type: "Debug"
+    )
+
+    upload_installable_build(product: 'Jetpack')
+  end
+
   #####################################################################################
   # build_bundle
   # -----------------------------------------------------------------------------------
@@ -262,4 +306,44 @@
     end
     "#{build_dir}#{name}"
   end
+
+  def upload_installable_build(product:)
+
+    filename = "#{product.downcase}-installable-build-#{generate_installable_build_number}.apk"
+
+    upload_path = upload_to_s3(
+      bucket: 'a8c-apps-public-artifacts',
+      key: filename,
+      file: lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
+    )
+
+    install_url = "#{INSTALLABLE_BUILD_DOMAIN}/#{upload_path}"
+    qr_code_url = "https://chart.googleapis.com/chart?chs=500x500&cht=qr&chl=#{URI::encode( install_url )}&choe=UTF-8"
+    comment_body = "You can test the #{product} changes on this Pull Request by <a href='#{install_url}'>downloading an installable build (#{filename})</a>, or scanning this QR code:<br><a href='#{install_url}'><img src='#{qr_code_url}' width='250' height='250' /></a>"
+
+    comment_on_pr(
+      project: GHHELPER_REPO,
+      pr_number: Integer(ENV['BUILDKITE_PULL_REQUEST']),
+      reuse_identifier: "#{product.downcase}-installable-build-link",
+      body: comment_body
+    ) unless ENV['BUILDKITE_PULL_REQUEST'].nil?
+  end
+
+  # This function is Buildkite-specific
+  def generate_installable_build_number
+
+    if ENV['BUILDKITE']
+      commit = ENV['BUILDKITE_COMMIT'][0,7]
+      branch = ENV['BUILDKITE_BRANCH'].parameterize
+      pr_num = ENV['BUILDKITE_PULL_REQUEST']
+
+      return pr_num == 'false' ? "#{branch}-#{commit}" : "pr#{pr_num}-#{commit}"
+    else
+      repo = Git.open(PROJECT_ROOT_FOLDER)
+      commit = repo.current_branch.parameterize
+      branch = repo.revparse('HEAD')[0, 7]
+
+      return "#{branch}-#{commit}"
+    end
+  end
 end