Merge remote trunk into fix/please-adopt-container-background-api-for…

…-widgets-xcode-15-ios-17 This is necessary to get up to date with a CI configuration change that requires running on Xcode 15.1. See #22270
wordpress-mobile · Jan 8, 2024 · 1e80d49 · 1e80d49
2 parents ca4673e + 7b65cbc
commit 1e80d49
Show file tree

Hide file tree

Showing 253 changed files with 1,396 additions and 2,065 deletions.
diff --git a/.buildkite/cache-builder.yml b/.buildkite/cache-builder.yml
@@ -14,7 +14,7 @@ common_params:
   # Common environment values to use with the `env` key.
   - &common_env
     # Be sure to also update the `.xcode-version` file when updating the Xcode image/version here
-    IMAGE_ID: xcode-14.3.1
+    IMAGE_ID: xcode-15.1
 
 steps:
 

diff --git a/.buildkite/commands/checkout-release-branch.sh b/.buildkite/commands/checkout-release-branch.sh
@@ -0,0 +1,14 @@
+#!/bin/bash -eu
+
+RELEASE_NUMBER=$1
+
+if [[ -z "${RELEASE_NUMBER}" ]]; then
+    echo "Usage $0 <release number, e.g. 1.2.3>"
+    exit 1
+fi
+
+# Buildkite, by default, checks out a specific commit.
+# For many release actions, we need to be on a release branch instead.
+BRANCH_NAME="release/${RELEASE_NUMBER}"
+git fetch origin "$BRANCH_NAME"
+git checkout "$BRANCH_NAME"
diff --git a/.buildkite/commands/complete-code-freeze.sh b/.buildkite/commands/complete-code-freeze.sh
@@ -0,0 +1,23 @@
+#!/bin/bash -eu
+
+RELEASE_NUMBER=$1
+
+if [[ -z "${RELEASE_NUMBER}" ]]; then
+    echo "Usage $0 <release number>"
+    exit 1
+fi
+
+echo '--- :git: Configure Git for release management'
+.buildkite/commands/configure-git-for-release-management.sh
+
+echo '--- :git: Checkout release branch'
+.buildkite/commands/checkout-release-branch.sh "$RELEASE_NUMBER"
+
+echo '--- :ruby: Setup Ruby tools'
+install_gems
+
+echo '--- :closed_lock_with_key: Access secrets'
+bundle exec fastlane run configure_apply
+
+echo '--- :shipit: Complete code freeze'
+bundle exec fastlane complete_code_freeze skip_confirm:true
diff --git a/.buildkite/commands/configure-git-for-release-management.sh b/.buildkite/commands/configure-git-for-release-management.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -eu
+
+# The Git command line client is not configured in Buildkite.
+# At the moment, steps that need Git access can configure it on deman using this script.
+# Later on, we should be able to configure it on the agent instead.
+
+curl -L https://api.github.com/meta | jq -r '.ssh_keys | .[]' | sed -e 's/^/github.com /' >> ~/.ssh/known_hosts
+git config --global user.email "mobile+wpmobilebot@automattic.com"
+git config --global user.name "Automattic Release Bot"
+
+# Buildkite is currently using the HTTPS URL to checkout.
+# We need to override it to be able to use the deploy key.
+git remote set-url origin git@github.com:wordpress-mobile/WordPress-iOS.git
diff --git a/.buildkite/commands/finalize-release.sh b/.buildkite/commands/finalize-release.sh
@@ -0,0 +1,23 @@
+#!/bin/bash -eu
+
+RELEASE_NUMBER=$1
+
+if [[ -z "${RELEASE_NUMBER}" ]]; then
+    echo "Usage $0 <release number>"
+    exit 1
+fi
+
+echo '--- :git: Configure Git for release management'
+.buildkite/commands/configure-git-for-release-management.sh
+
+echo '--- :git: Checkout release branch'
+.buildkite/commands/checkout-release-branch.sh "$RELEASE_NUMBER"
+
+echo '--- :ruby: Setup Ruby tools'
+install_gems
+
+echo '--- :closed_lock_with_key: Access secrets'
+bundle exec fastlane run configure_apply
+
+echo '--- :shipit: Finalize release'
+bundle exec fastlane finalize_release skip_confirm:true
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -3,13 +3,10 @@ common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
     - automattic/a8c-ci-toolkit#2.18.1
-    - automattic/git-s3-cache#1.1.4:
-        bucket: "a8c-repo-mirrors"
-        repo: "automattic/wordpress-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
     # Be sure to also update the `.xcode-version` file when updating the Xcode image/version here
-    IMAGE_ID: xcode-14.3.1
+    IMAGE_ID: xcode-15.1
 
 # This is the default pipeline – it will build and test the app
 steps:
@@ -80,7 +77,7 @@ steps:
   - group: "🔬 UI Tests"
     steps:
       - label: "🔬 :jetpack: UI Tests (iPhone)"
-        command: .buildkite/commands/run-ui-tests.sh 'iPhone SE (3rd generation)'
+        command: .buildkite/commands/run-ui-tests.sh 'iPhone 15'
         depends_on: "build_jetpack"
         env: *common_env
         plugins: *common_plugins
@@ -92,7 +89,7 @@ steps:
               context: "UI Tests (iPhone)"
 
       - label: "🔬 :jetpack: UI Tests (iPad)"
-        command: .buildkite/commands/run-ui-tests.sh 'iPad Air (5th generation)'
+        command: .buildkite/commands/run-ui-tests.sh 'iPad Pro (12.9-inch) (6th generation)'
         depends_on: "build_jetpack"
         env: *common_env
         plugins: *common_plugins

diff --git a/.buildkite/release-builds.yml b/.buildkite/release-builds.yml
@@ -11,7 +11,7 @@ common_params:
   # Common environment values to use with the `env` key.
   - &common_env
     # Be sure to also update the `.xcode-version` file when updating the Xcode image/version here
-    IMAGE_ID: xcode-14.3.1
+    IMAGE_ID: xcode-15.1
 
 steps:
 

diff --git a/.buildkite/release-pipelines/code-freeze.yml b/.buildkite/release-pipelines/code-freeze.yml
@@ -0,0 +1,20 @@
+steps:
+  - label: Code Freeze
+    plugins:
+      - automattic/a8c-ci-toolkit#2.18.2
+    # The first client to implement releases in CI was Android so the automation works in that queue.
+    # We might want to move it to a leaner one in the future.
+    agents:
+        queue: android
+    command: |
+      echo '--- :git: Configure Git for release management'
+      .buildkite/commands/configure-git-for-release-management.sh
+
+      echo '--- :ruby: Setup Ruby tools'
+      install_gems
+
+      echo '--- :closed_lock_with_key: Access secrets'
+      bundle exec fastlane run configure_apply
+
+      echo '--- :shipit: Run code freeze'
+      bundle exec fastlane code_freeze skip_confirm:true
diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml
@@ -0,0 +1,10 @@
+steps:
+  - label: Complete Code Freeze
+    plugins:
+      - automattic/a8c-ci-toolkit#2.18.2
+    # The code freeze completion needs to run on macOS because it uses genstrings under the hood
+    agents:
+        queue: mac
+    env:
+      IMAGE_ID: xcode-14.3.1
+    command: ".buildkite/commands/complete-code-freeze.sh $RELEASE_VERSION"
diff --git a/.buildkite/release-pipelines/finalize-release.yml b/.buildkite/release-pipelines/finalize-release.yml
@@ -0,0 +1,10 @@
+steps:
+  - label: Finalize Release
+    plugins:
+      - automattic/a8c-ci-toolkit#2.18.2
+    # The finalization needs to run on macOS because of localization linting
+    agents:
+        queue: mac
+    env:
+      IMAGE_ID: xcode-14.3.1
+    command: ".buildkite/commands/finalize-release.sh $RELEASE_VERSION"
diff --git a/.buildkite/release-pipelines/new-beta-release.yml b/.buildkite/release-pipelines/new-beta-release.yml
@@ -0,0 +1,21 @@
+steps:
+  - label: New Beta Deployment
+    plugins:
+      - automattic/a8c-ci-toolkit#2.18.2
+    # The beta needs to run on macOS because it uses genstrings under the hood
+    agents:
+        queue: mac
+    env:
+      IMAGE_ID: xcode-14.3.1
+    command: |
+      echo '--- :git: Configure Git for release management'
+      .buildkite/commands/configure-git-for-release-management.sh
+
+      echo '--- :ruby: Setup Ruby tools'
+      install_gems
+
+      echo '--- :closed_lock_with_key: Access secrets'
+      bundle exec fastlane run configure_apply
+
+      echo '--- :shipit: Deploy new beta'
+      bundle exec fastlane new_beta_release skip_confirm:true
diff --git a/.buildkite/release-pipelines/update-app-store-strings.yml b/.buildkite/release-pipelines/update-app-store-strings.yml
@@ -0,0 +1,20 @@
+steps:
+  - label: Update App Store Strings
+    plugins:
+      - automattic/a8c-ci-toolkit#2.18.2
+    # The first client to implement releases in CI was Android so the automation works in that queue.
+    # We might want to move it to a leaner one in the future.
+    agents:
+        queue: android
+    command: |
+      echo '--- :git: Configure Git for release management'
+      .buildkite/commands/configure-git-for-release-management.sh
+
+      echo '--- :ruby: Setup Ruby tools'
+      install_gems
+
+      echo '--- :closed_lock_with_key: Access secrets'
+      bundle exec fastlane run configure_apply
+
+      echo '--- :shipit: Update relaese notes and other App Store metadata'
+      bundle exec fastlane update_appstore_strings skip_confirm:true
diff --git a/.xcode-version b/.xcode-version
@@ -1 +1 @@
-14.3.1
+15.1
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_visits-year.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_visits-year.json
@@ -20,7 +20,7 @@
   "response": {
     "status": 200,
     "jsonBody": {
-      "date": "2019-07-16",
+      "date": "{{now format='yyyy-MM-dd'}}",      
       "unit": "year",
       "fields": [
         "period",
@@ -33,7 +33,7 @@
       ],
       "data": [
         [
-          "2005-01-01",
+          "{{now offset='-7 years' format='yyyy-MM-dd'}}",
           0,
           0,
           0,
@@ -42,7 +42,7 @@
           0
         ],
         [
-          "2006-01-01",
+          "{{now offset='-6 years' format='yyyy-MM-dd'}}",
           0,
           0,
           0,
@@ -51,7 +51,7 @@
           0
         ],
         [
-          "2007-01-01",
+          "{{now offset='-5 years' format='yyyy-MM-dd'}}",
           0,
           0,
           0,
@@ -60,7 +60,7 @@
           0
         ],
         [
-          "2008-01-01",
+          "{{now offset='-4 years' format='yyyy-MM-dd'}}",
           0,
           0,
           0,
@@ -69,70 +69,7 @@
           0
         ],
         [
-          "2009-01-01",
-          0,
-          0,
-          0,
-          0,
-          0,
-          0
-        ],
-        [
-          "2010-01-01",
-          0,
-          0,
-          0,
-          0,
-          0,
-          0
-        ],
-        [
-          "2011-01-01",
-          0,
-          0,
-          0,
-          0,
-          0,
-          0
-        ],
-        [
-          "2012-01-01",
-          0,
-          0,
-          0,
-          0,
-          0,
-          0
-        ],
-        [
-          "2013-01-01",
-          0,
-          0,
-          0,
-          0,
-          0,
-          0
-        ],
-        [
-          "2014-01-01",
-          0,
-          0,
-          0,
-          0,
-          0,
-          0
-        ],
-        [
-          "2015-01-01",
-          0,
-          0,
-          0,
-          0,
-          0,
-          0
-        ],
-        [
-          "2016-01-01",
+          "{{now offset='-3 years' format='yyyy-MM-dd'}}",
           48,
           12,
           0,
@@ -141,7 +78,7 @@
           13
         ],
         [
-          "2017-01-01",
+          "{{now offset='-2 years' format='yyyy-MM-dd'}}",
           788,
           465,
           0,
@@ -150,7 +87,7 @@
           3
         ],
         [
-          "2018-01-01",
+          "{{now offset='-1 years' format='yyyy-MM-dd'}}",
           1215,
           632,
           0,
@@ -159,7 +96,7 @@
           3
         ],
         [
-          "2019-01-01",
+          "{{now format='yyyy-MM-dd'}}",
           9148,
           4216,
           1351,

diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,8 @@ gem 'cocoapods', '~> 1.14'
 gem 'commonmarker'
 gem 'danger-dangermattic', git: 'https://github.com/Automattic/dangermattic'
 gem 'dotenv'
-gem 'fastlane', '~> 2.216'
+# 2.217.0 includes a fix for Xcode 15 test results parsing in CI
+gem 'fastlane', '~> 2.217'
 gem 'fastlane-plugin-appcenter', '~> 2.1'
 gem 'fastlane-plugin-sentry'
 # This comment avoids typing to switch to a development version for testing.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -405,7 +405,7 @@ DEPENDENCIES
   commonmarker
   danger-dangermattic!
   dotenv
-  fastlane (~> 2.216)
+  fastlane (~> 2.217)
   fastlane-plugin-appcenter (~> 2.1)
   fastlane-plugin-sentry
   fastlane-plugin-wpmreleasetoolkit (~> 9.1)