Merge trunk into merge/19.1.0.3-into-trunk

Conflicts on `Podfile` and `Podfile.lock` because of the Gutenberg
hotfix (1.70.1) in the release branch. I resolved them by keeping the `trunk`
version (1.71.0-alpha2) because it's the latest, even though it doesn't
yet include the hotfix. It will soon, though:
wordpress-mobile/gutenberg-mobile#4540

Author: mokagio

.buildkite/commands/build-for-testing.sh

@@ -5,7 +5,6 @@ echo "--- :rubygems: Fixing Ruby Setup"
 gem install bundler
 
 echo "--- :rubygems: Setting up Gems"
-restore_cache "$(hash_file .ruby-version)-$(hash_file Gemfile.lock)"
 install_gems
 
 echo "--- :cocoapods: Setting up Pods"

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

@@ -0,0 +1,17 @@
+#!/bin/bash -eu
+
+# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
+echo "--- :rubygems: Fixing Ruby Setup"
+gem install bundler
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :cocoapods: Setting up Pods"
+install_cocoapods
+
+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/installable-build-wordpress.sh

@@ -0,0 +1,17 @@
+#!/bin/bash -eu
+
+# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
+echo "--- :rubygems: Fixing Ruby Setup"
+gem install bundler
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :cocoapods: Setting up Pods"
+install_cocoapods
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :hammer_and_wrench: Building"
+bundle exec fastlane build_and_upload_installable_build

.buildkite/pipeline.yml

@@ -12,23 +12,51 @@ common_params:
 
 # This is the default pipeline – it will build and test the app
 steps:
+
+  #################
+  # Create Installable Builds for WP and JP
+  #################
+  - label: "🛠 WordPress Installable Build"
+    command: ".buildkite/commands/installable-build-wordpress.sh"
+    env: *common_env
+    plugins: *common_plugins
+    if: build.pull_request.id != null
+    notify:
+      - github_commit_status:
+          context: "WordPress Installable Build"
+
+  - label: "🛠 Jetpack Installable Build"
+    command: ".buildkite/commands/installable-build-jetpack.sh"
+    env: *common_env
+    plugins: *common_plugins
+    if: build.pull_request.id != null
+    notify:
+      - github_commit_status:
+          context: "Jetpack Installable Build"
+
   #################
   # Build the app
   #################
-  - label: ":pipeline: Build"
+  - label: "🛠 Build for Testing"
     key: "build"
     command: ".buildkite/commands/build-for-testing.sh"
     env: *common_env
     plugins: *common_plugins
+    notify:
+      - github_commit_status:
+          context: "Build for Testing"
 
   #################
   # Run Unit Tests
   #################
-  - label: "🧪 Unit Tests"
+  - label: "🔬 Unit Tests"
     command: ".buildkite/commands/run-unit-tests.sh"
     depends_on: "build"
     env: *common_env
     plugins: *common_plugins
+    notify:
+      - github_commit_status:
+          context: "Unit Tests"
 
   #################
   # Lint Translations
@@ -40,23 +68,31 @@ steps:
           image: "public.ecr.aws/automattic/glotpress-validator:1.0.0"
     agents:
       queue: "default"
+    notify:
+      - github_commit_status:
+          context: "Lint Translations"
 
   #################
   # UI Tests
   #################
-  - label: "🧪 UI Tests (iPhone)"
+  - label: "🔬 UI Tests (iPhone)"
     command: .buildkite/commands/run-ui-tests.sh WordPressUITests 'iPhone 13' 15.0
     depends_on: "build"
     env: *common_env
     plugins: *common_plugins
     artifact_paths:
       - "build/results/"
+    notify:
+      - github_commit_status:
+          context: "UI Tests (iPhone)"
 
-
-  - label: "🧪 UI Tests (iPad)"
+  - label: "🔬 UI Tests (iPad)"
     command: .buildkite/commands/run-ui-tests.sh WordPressUITests "iPad Air (4th generation)" 15.0
     depends_on: "build"
     env: *common_env
     plugins: *common_plugins
     artifact_paths:
       - "build/results/"
+    notify:
+      - github_commit_status:
+          context: "UI Tests (iPad)"

.circleci/config.yml

@@ -150,31 +150,6 @@ jobs:
                 include_job_number_field: false
                 include_project_field: false
                 failure_message: '${SLACK_FAILURE_MESSAGE}'
-  WordPress Installable Build:
-    executor:
-      name: ios/default
-      <<: *xcode_version
-    steps:
-      - fix-image
-      - git/shallow-checkout
-      - ios/install-dependencies:
-            bundle-install: true
-            pod-install: true
-            cache-prefix: cache-prefix-{{ checksum ".circleci/cache-version" }}
-      - run:
-          name: Copy Secrets
-          command: bundle exec fastlane run configure_apply
-      - run:
-          name: Build
-          command: "bundle exec fastlane build_and_upload_installable_build build_number:$CIRCLE_BUILD_NUM"
-      - run:
-          name: Prepare Artifacts
-          command: |
-            mkdir -p Artifacts
-            mv "fastlane/comment.json" "Artifacts/comment.json"
-      - store_artifacts:
-          path: Artifacts
-          destination: Artifacts
   Release Build:
     executor:
       name: ios/default
@@ -233,36 +208,6 @@ jobs:
           webhook: '${SLACK_BUILD_WEBHOOK}'
           failure_message: '${SLACK_FAILURE_MESSAGE}'
           success_message: '${SLACK_SUCCESS_MESSAGE}'
-  Jetpack Installable Build:
-    executor:
-      name: ios/default
-      <<: *xcode_version
-    environment:
-      HOMEBREW_NO_AUTO_UPDATE: 1
-    steps:
-      - fix-image
-      - git/shallow-checkout
-      - ios/install-dependencies:
-            bundle-install: true
-            pod-install: true
-            cache-prefix: cache-prefix-{{ checksum ".circleci/cache-version" }}
-      - run:
-          name: Copy Secrets
-          command: bundle exec fastlane run configure_apply
-      - run:
-          name: Install other tools
-          command: |
-            brew update # Update homebrew to temporarily fix a bintray issue
-            brew install imagemagick
-            brew install ghostscript
-            curl -sL https://sentry.io/get-cli/ | bash
-      - run:
-          name: Build
-          command: bundle exec fastlane build_and_upload_jetpack_installable_build
-          no_output_timeout: 60m
-      - store_artifacts:
-          path: Artifacts
-          destination: Artifacts
   Build Jetpack:
     executor:
       name: ios/default
@@ -345,45 +290,9 @@ workflows:
           name: UI Tests (iPad)
           <<: *ipad_test_device
           requires: [ "Optional Tests" ]
-  Installable Build:
-    when:
-      and:
-        - not: << pipeline.parameters.beta_build >>
-        - not: << pipeline.parameters.release_build >>
-    jobs:
-      - Approve WordPress:
-          type: approval
-          filters:
-            branches:
-              ignore: /pull\/[0-9]+/
-      - WordPress Installable Build:
-          requires: [Approve WordPress]
-          filters:
-            branches:
-              ignore: /pull\/[0-9]+/
-      - Approve Jetpack:
-          type: approval
-          filters:
-            branches:
-              ignore: /pull\/[0-9]+/
-      - Jetpack Installable Build:
-          requires: [Approve Jetpack]
-          filters:
-            branches:
-              ignore: /pull\/[0-9]+/
 
   Release Build:
     when:
       or: [ << pipeline.parameters.beta_build >>, << pipeline.parameters.release_build >> ]
     jobs:
       - Release Build
-  Jetpack Nightly:
-    triggers:
-       - schedule:
-           cron: "0 0 * * *"
-           filters:
-             branches:
-               only:
-                 - trunk
-    jobs:
-      - Jetpack Installable Build

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'cocoapods', '~> 1.10'
+gem 'cocoapods', '~> 1.11'
 gem 'xcpretty-travis-formatter'
 gem 'octokit', "~> 4.0"
 gem 'fastlane', "~> 2.174"