Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-iOS into feature/image-block-replace-featured-image-prompt

Author: dcalhoun

.buildkite/cache-builder.yml

@@ -13,13 +13,13 @@ common_params:
         repo: "wordpress-mobile/wordpress-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-12.5.1
+    IMAGE_ID: xcode-13
 
 steps:
 
   #################
   # Build the CocoaPods Base Cache
-  # 
+  #
   # This prevents the base cache from infinite growth caused by storing every
   # version of every pod we've ever used.
   #################

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

@@ -1,5 +1,9 @@
 #!/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"
 restore_cache "$(hash_file .ruby-version)-$(hash_file Gemfile.lock)"
 install_gems
@@ -12,9 +16,12 @@ cp -v fastlane/env/project.env-example .configure-files/project.env
 mkdir -pv ~/.configure/wordpress-ios/secrets
 cp -v fastlane/env/project.env-example ~/.configure/wordpress-ios/secrets/project.env
 
+echo "--- Installing Secrets"
+bundle exec fastlane run configure_apply
+
 echo "--- :hammer_and_wrench: Building"
 bundle exec fastlane build_for_testing
 
 echo "--- :arrow_up: Upload Build Products"
 tar -cf build-products.tar DerivedData/Build/Products/
-buildkite-agent artifact upload build-products.tar
+upload_artifact build-products.tar

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

@@ -7,13 +7,17 @@ IOS_VERSION=$3
 echo "Running $TEST_NAME on $DEVICE for iOS $IOS_VERSION"
 
 echo "--- 📦 Downloading Build Artifacts"
-buildkite-agent artifact download build-products.tar .
+download_artifact build-products.tar
 tar -xf build-products.tar
 
 echo "--- :wrench: Fixing VM"
 brew install openjdk@11
 sudo ln -sfn /usr/local/opt/openjdk@11/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-11.jdk
 
+# 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
 

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

@@ -1,9 +1,13 @@
 #!/bin/bash -eu
 
 echo "--- 📦 Downloading Build Artifacts"
-buildkite-agent artifact download build-products.tar .
+download_artifact build-products.tar
 tar -xf build-products.tar
 
+# 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
 

.buildkite/pipeline.yml

@@ -2,13 +2,13 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/bash-cache#v1.5.0
+    - automattic/bash-cache#v1.6.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-12.5.1
+    IMAGE_ID: xcode-13 # Remember to address all 'FIXIT-13.1' comments when we'll update to new image
 
 # This is the default pipeline – it will build and test the app
 steps:
@@ -45,7 +45,7 @@ steps:
   # UI Tests
   #################
   - label: "🧪 UI Tests (iPhone)"
-    command: .buildkite/commands/run-ui-tests.sh WordPressUITests 'iPhone 11' 14.1
+    command: .buildkite/commands/run-ui-tests.sh WordPressUITests 'iPhone 13' 15.0
     depends_on: "build"
     env: *common_env
     plugins: *common_plugins
@@ -54,7 +54,7 @@ steps:
 
 
   - label: "🧪 UI Tests (iPad)"
-    command: .buildkite/commands/run-ui-tests.sh WordPressUITests "iPad Air (4th generation)" 14.1
+    command: .buildkite/commands/run-ui-tests.sh WordPressUITests "iPad Air (4th generation)" 15.0
     depends_on: "build"
     env: *common_env
     plugins: *common_plugins

.bundle/config

@@ -1,3 +1,4 @@
 ---
 BUNDLE_PATH: "vendor/bundle"
+BUNDLE_JOBS: "16"
 BUNDLE_WITHOUT: "screenshots"

.circleci/config.yml

@@ -15,15 +15,15 @@ parameters:
     default: false
 
 xcode_version: &xcode_version
-  xcode-version: "12.5.0"
+  xcode-version: "13.0.0"
 
 iphone_test_device: &iphone_test_device
-  device: iPhone 11
-  ios-version: "14.4"
+  device: iPhone 12
+  ios-version: "15.0"
 
 ipad_test_device: &ipad_test_device
   device: iPad Air (4th generation)
-  ios-version: "14.4"
+  ios-version: "15.0"
 
 commands:
   fix-image:
@@ -39,7 +39,7 @@ commands:
               echo $PATH
             fi
 
-            chruby ruby-2.6.6
+            chruby ruby-$(cat .ruby-version)
             gem install bundler
 
             # Prevent fastlane from checking for updates, also removing the verbose fastlane changelog at the end of each invocation.
@@ -101,7 +101,7 @@ jobs:
           command: bundle --path vendor/bundle
       - run:
           name: Run Unit Tests
-          command: bundle exec fastlane test_without_building name:WordPressUnitTests try_count:3 device:'<< parameters.device >>' ios-version:'<< parameters.ios-version >>'
+          command: bundle exec fastlane test_without_building name:WordPressUnitTests device:'<< parameters.device >>' ios-version:'<< parameters.ios-version >>'
       - ios/save-xcodebuild-artifacts:
           result-bundle-path: build/results
   UI Tests:
@@ -133,7 +133,7 @@ jobs:
           background: true
       - run:
           name: Run UI Tests
-          command: bundle exec fastlane test_without_building name:WordPressUITests try_count:3 device:'<< parameters.device >>' ios-version:'<< parameters.ios-version >>'
+          command: bundle exec fastlane test_without_building name:WordPressUITests device:'<< parameters.device >>' ios-version:'<< parameters.ios-version >>'
       - ios/save-xcodebuild-artifacts:
           result-bundle-path: build/results
       - when:
@@ -302,27 +302,27 @@ workflows:
       - Unit Tests:
           <<: *iphone_test_device
           requires: [ "Build Tests" ]
-      # Always run UI tests on develop and release branches
+      # Always run UI tests on trunk and release branches
       - UI Tests:
-          name: UI Tests (iPhone 11)
+          name: UI Tests (iPhone)
           <<: *iphone_test_device
           post-to-slack: true
           requires: [ "Build Tests" ]
           filters:
             branches:
               only:
-                - develop
+                - trunk
                 - /^release.*/
                 - /^gutenberg\/integrate_release_.*/
       - UI Tests:
-          name: UI Tests (iPad Air 4th generation)
+          name: UI Tests (iPad)
           <<: *ipad_test_device
           post-to-slack: true
           requires: [ "Build Tests" ]
           filters:
             branches:
               only:
-                - develop
+                - trunk
                 - /^release.*/
                 - /^gutenberg\/integrate_release_.*/
       - Build Jetpack:
@@ -334,15 +334,15 @@ workflows:
           filters:
             branches:
               ignore:
-                - develop
+                - trunk
                 - /^release.*/
                 - /^gutenberg\/integrate_release_.*/
       - UI Tests:
-          name: UI Tests (iPhone 11)
+          name: UI Tests (iPhone)
           <<: *iphone_test_device
           requires: [ "Optional Tests" ]
       - UI Tests:
-          name: UI Tests (iPad Air 4th generation)
+          name: UI Tests (iPad)
           <<: *ipad_test_device
           requires: [ "Optional Tests" ]
   Installable Build:
@@ -384,6 +384,6 @@ workflows:
            filters:
              branches:
                only:
-                 - develop
+                 - trunk
     jobs:
       - Jetpack Installable Build

.gitignore

@@ -90,11 +90,15 @@ Artifacts
 WordPress/Resources/AppImages.xcassets/AppIcon-Internal.appiconset
 WordPress/Resources/Icons-Internal
 
-# All secrets should be stored under .configure-files
+# All encrypted secrets should be stored under .configure-files
 # Everything without a .enc extension is ignored
 .configure-files/*
 !.configure-files/*.enc
 
+# A file external contributors can have locally to provide their own credentials.
+# This file is created during the `rake init:oss` task, based on the Secrets-example.swift file.
+WordPress/Credentials/Secrets.swift
+
 # Ignoring old locations to be sure they aren't commited accidentally
 WordPress/Credentials/wpcom_app_credentials
 WordPress/Credentials/wpcom_alpha_app_credentials

.ruby-version

@@ -1 +1 @@
-2.6.4
+2.7.4

.xcversion

@@ -1 +1 @@
-12.5
+13.0