Merge remote-tracking branch 'origin/release/19.2' into bug/aztec-hea…

…dings

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

@@ -4,6 +4,10 @@
 echo "--- :rubygems: Fixing Ruby Setup"
 gem install bundler
 
+# FIXIT-13.1: Installable Builds want the latest version of Sentry CLI
+brew update
+brew upgrade sentry-cli
+
 echo "--- :rubygems: Setting up Gems"
 install_gems
 

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

@@ -4,6 +4,10 @@
 echo "--- :rubygems: Fixing Ruby Setup"
 gem install bundler
 
+# FIXIT-13.1: Installable Builds want the latest version of Sentry CLI
+brew update
+brew upgrade sentry-cli
+
 echo "--- :rubygems: Setting up Gems"
 install_gems
 

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

@@ -0,0 +1,22 @@
+#!/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 "--- :arrow_down: Installing Release Dependencies"
+brew update # Update homebrew to temporarily fix a bintray issue
+brew install imagemagick
+brew install ghostscript
+
+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_for_app_store

.buildkite/commands/release-build-wordpress-internal.sh

@@ -0,0 +1,22 @@
+#!/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 "--- :arrow_down: Installing Release Dependencies"
+brew update # Update homebrew to temporarily fix a bintray issue
+brew install imagemagick
+brew install ghostscript
+
+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_app_center skip_confirm:true

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

@@ -0,0 +1,25 @@
+#!/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 "--- :arrow_down: Installing Release Dependencies"
+brew update # Update homebrew to temporarily fix a bintray issue
+brew install imagemagick
+brew install ghostscript
+
+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_app_store_connect \
+  skip_confirm:true \
+  create_gh_release:true \
+  beta_release:${1:-true} # use first call param, default to true for safety

.buildkite/commands/run-ui-tests.sh

@@ -27,4 +27,13 @@ install_cocoapods
 echo "--- 🧪 Testing"
 xcrun simctl list >> /dev/null
 rake mocks &
+set +e
 bundle exec fastlane test_without_building name:"$TEST_NAME" try_count:3 device:"$DEVICE" ios_version:"$IOS_VERSION"
+TESTS_EXIT_STATUS=$?
+set -e
+
+echo "--- 📦 Zipping test results"
+cd build/results/ && zip -rq WordPress.xcresult.zip WordPress.xcresult
+
+echo "--- 🚦 Report Tests Exit Status"
+exit $TESTS_EXIT_STATUS

.buildkite/pipeline.yml

@@ -81,7 +81,7 @@ steps:
     env: *common_env
     plugins: *common_plugins
     artifact_paths:
-      - "build/results/"
+      - "build/results/*"
     notify:
       - github_commit_status:
           context: "UI Tests (iPhone)"
@@ -92,7 +92,7 @@ steps:
     env: *common_env
     plugins: *common_plugins
     artifact_paths:
-      - "build/results/"
+      - "build/results/*"
     notify:
       - github_commit_status:
           context: "UI Tests (iPad)"

.buildkite/release-builds.yml

@@ -0,0 +1,36 @@
+# This pipeline is meant to be run via the Buildkite API, and is only used for release builds
+
+# Nodes with values to reuse in the pipeline.
+common_params:
+  # Common plugin settings to use with the `plugins` key.
+  - &common_plugins
+    - automattic/bash-cache#v1.5.0
+    - automattic/git-s3-cache#v1.1.0:
+        bucket: "a8c-repo-mirrors"
+        repo: "wordpress-mobile/wordpress-ios/"
+  # Common environment values to use with the `env` key.
+  - &common_env
+    IMAGE_ID: xcode-13
+
+steps:
+
+  - label: "🛠 WordPress Release Build (App Store Connect)"
+    command: ".buildkite/commands/release-build-wordpress.sh $BETA_RELEASE"
+    env: *common_env
+    plugins: *common_plugins
+    notify:
+    - slack: "#build-and-ship"
+
+  - label: "🛠 WordPress Release Build (App Center)"
+    command: ".buildkite/commands/release-build-wordpress-internal.sh"
+    env: *common_env
+    plugins: *common_plugins
+    notify:
+    - slack: "#build-and-ship"
+
+  - label: "🛠 Jetpack Release Build (App Store Connect)"
+    command: ".buildkite/commands/release-build-jetpack.sh"
+    env: *common_env
+    plugins: *common_plugins
+    notify:
+    - slack: "#build-and-ship"