[pull] trunk from Automattic:trunk

.buildkite/commands/checkout-release-branch.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -eu
+
+# We expect BUILDKITE_RELEASE_VERSION to be as an environment variable, e.g. by the automation that triggers the build on Buildkite.
+# It must use the `BUILDKITE_` prefix to be passed to the agent due to how `hostmgr` works, in case this runs on a Mac agents.
+if [[ -z "${BUILDKITE_RELEASE_VERSION}" ]]; then
+    echo "BUILDKITE_RELEASE_VERSION is not set."
+    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/${BUILDKITE_RELEASE_VERSION}"
+git fetch origin "$BRANCH_NAME"
+git checkout "$BRANCH_NAME"

.buildkite/commands/configure-git-for-release-management.sh

@@ -0,0 +1,8 @@
+#!/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.
+add_host_to_ssh_known_hosts github.com
+git config --global user.email "[email protected]"
+git config --global user.name "Automattic Release Bot"

.buildkite/commands/release-build.sh

@@ -9,9 +9,5 @@ install_cocoapods
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- :hammer_and_wrench: Build and Upload to App Store Connect"
-bundle exec fastlane build_and_upload_to_app_store_connect \
-  skip_confirm:true \
-  skip_prechecks:true \
-  create_release:true \
-  beta_release:${1:-true} # use first call param, default to true for safety
+echo "--- :hammer_and_wrench: Build for App Store Connect"
+bundle exec fastlane build_for_app_store_connect

.buildkite/commands/release-upload.sh

@@ -0,0 +1,19 @@
+#!/bin/bash -eu
+
+echo "--- :arrow_down: Downloading Artifacts"
+ARTIFACTS_DIR='build/results'
+STEP=testflight_build
+buildkite-agent artifact download "$ARTIFACTS_DIR/*.ipa" . --step $STEP
+buildkite-agent artifact download "$ARTIFACTS_DIR/*.zip" . --step $STEP
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :hammer_and_wrench: Upload to App Store Connect"
+bundle exec fastlane upload_to_app_store_connect \
+  skip_prechecks:true \
+  create_release:true \
+  "beta_release:${1:-true}" # use first call param, default to true for safety

.buildkite/pipeline.yml

@@ -1,11 +1,13 @@
-# Nodes with values to reuse in the pipeline.
-common_params:
-  # Common plugin settings to use with the `plugins` key.
-  - &common_plugins
-    - automattic/a8c-ci-toolkit#3.0.1
-  # Common environment values to use with the `env` key.
-  - &common_env
-    IMAGE_ID: xcode-15.1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+# Variables used in this pipeline are defined in `shared-pipeline-vars`, which is `source`'d before calling `buildkite-agent pipeline upload`
+
+agents:
+  queue: mac
+
+env:
+  IMAGE_ID: $IMAGE_ID
 
 # This is the default pipeline – it will build and test the app
 steps:
@@ -15,18 +17,34 @@ steps:
   #################
   - label: "🔬 Build and Test"
     command: ".buildkite/commands/build-and-test.sh"
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     artifact_paths:
       - "build/results/*"
 
+  #################
+  # Linters
+  #################
+  - label: "☢️ Danger - PR Check"
+    command: danger
+    key: danger
+    if: "build.pull_request.id != null"
+    retry:
+      manual:
+        permit_on_passed: true
+    agents:
+      queue: "linter"
+
+  - label: ":swift: SwiftLint"
+    command: swiftlint
+    agents:
+      queue: "linter"
+
   #################
   # Create Installable Build
   #################
   - label: "🛠 Installable Build"
     command: ".buildkite/commands/build-prototype.sh"
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     if: "build.pull_request.id != null || build.pull_request.draft"
     artifact_paths:
       - "build/results/*"
@@ -36,7 +54,6 @@ steps:
   #################
   - label: "🔬 UI Test (Full)"
     command: ".buildkite/commands/build-and-ui-test.sh SimplenoteUITests 'iPhone SE (3rd generation)'"
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     artifact_paths:
       - "build/results/*"

.buildkite/release-build.yml

@@ -1,20 +1,22 @@
-# 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/a8c-ci-toolkit#3.0.1
-  # Common environment values to use with the `env` key.
-  - &common_env
-    IMAGE_ID: xcode-15.1
+env:
+  IMAGE_ID: $IMAGE_ID
+agents:
+  queue: mac
 
 steps:
+  - label: ":testflight: Build Simplenote iOS for App Store Connect"
+    key: testflight_build
+    command: .buildkite/commands/release-build.sh
+    priority: 1
+    plugins: [$CI_TOOLKIT_PLUGIN]
+    artifact_paths:
+      - build/results/*.zip
+      - build/results/*.ipa
 
-  - label: ":testflight: Simplenote iOS Release Build (App Store Connect)"
-    command: ".buildkite/commands/release-build.sh"
+  - label: ":testflight: Upload Simplenote iOS to App Store Connect"
+    depends_on: testflight_build
+    command: .buildkite/commands/release-upload.sh $BETA_RELEASE
     priority: 1
-    env: *common_env
-    plugins: *common_plugins
+    plugins: [$CI_TOOLKIT_PLUGIN]
     notify:
     - slack: "#build-and-ship"

.buildkite/release-pipelines/complete-code-freeze.yml

@@ -0,0 +1,36 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+# Variables used in this pipeline are defined in `shared-pipeline-vars`, which is `source`'d before calling `buildkite-agent pipeline upload`
+
+env:
+  IMAGE_ID: $IMAGE_ID
+
+# The code freeze completion needs to run on macOS because it uses genstrings under the hood.
+agents:
+    queue: mac
+
+steps:
+  - label: Complete Code Freeze
+    key: complete_code_freeze
+    plugins: [$CI_TOOLKIT_PLUGIN]
+    command: |
+      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
+
+      echo '--- :ruby: Set up 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
+    retry:
+      manual:
+        # If failed, we prefer retrying via ReleaseV2 rather than Buildkite.
+        # Rationale: ReleaseV2 is the source of truth for the process and track links to the various builds.
+        allowed: false

.buildkite/release-pipelines/new-beta-release.yml

@@ -0,0 +1,35 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+agents:
+  queue: mac
+
+# The new beta workflow needs to run on macOS because it uses SwiftGen under the hood.
+#
+# Notice that SwiftGen should work Linux, but we haven't tested it yet.
+# One thing at a time...
+env:
+  IMAGE_ID: $IMAGE_ID
+
+steps:
+  - label: New Beta Release
+    plugins: [$CI_TOOLKIT_PLUGIN]
+    command: |
+      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
+
+      echo '--- :ruby: Set up Ruby Tools'
+      install_gems
+
+      echo '--- :closed_lock_with_key: Access Secrets'
+      bundle exec fastlane run configure_apply
+
+      echo '--- :shipit: New Beta Release'
+      bundle exec fastlane new_beta_release skip_confirm:true
+    retry:
+      manual:
+        # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
+        allowed: false

.buildkite/release-pipelines/start-code-freeze.yml

@@ -0,0 +1,25 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+# Variables used in this pipeline are defined in `shared-pipeline-vars`, which is `source`'d before calling `buildkite-agent pipeline upload`
+
+steps:
+  - label: Start Code Freeze
+    plugins:
+      - $CI_TOOLKIT_PLUGIN
+    agents:
+        queue: tumblr-metal
+    command: |
+      echo '--- :robot_face: Use bot for Git operations'
+      source use-bot-for-git wpmobilebot
+
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
+
+      echo '--- :shipit: Start code freeze'
+      bundle exec fastlane start_code_freeze skip_confirm:true
+    retry:
+      manual:
+        # If failed, we prefer retrying via ReleaseV2 rather than Buildkite.
+        # Rationale: ReleaseV2 is the source of truth for the process and track links to the various builds.
+        allowed: false

.buildkite/shared-pipeline-vars

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This file is `source`'d before calling `buildkite-agent pipeline upload`, and can be used
+# to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
+
+# The ~> modifier is not currently used, but we check for it just in case
+XCODE_VERSION=$(sed -E -n 's/^(~> )?(.*)/xcode-\2/p' .xcode-version)
+export CI_TOOLKIT_PLUGIN_VERSION="3.4.2"
+
+export IMAGE_ID="$XCODE_VERSION"
+export CI_TOOLKIT_PLUGIN="automattic/a8c-ci-toolkit#$CI_TOOLKIT_PLUGIN_VERSION"

.bundle/config

@@ -1,4 +1,5 @@
 ---
+BUNDLE_BUNDLE_SPECIFIC_PLATFORM: "false"
 BUNDLE_PATH: "vendor/bundle"
 BUNDLE_RETRY: "3"
 BUNDLE_JOBS: "3"

.configure

@@ -18,11 +18,6 @@
       "destination": "~/.configure/simplenote-ios/secrets/google_cloud_keys.json",
       "encrypt": true
     },
-    {
-      "file": "iOS/simplenote/project.env",
-      "destination": "~/.configure/simplenote-ios/secrets/project.env",
-      "encrypt": true
-    },
     {
       "file": "iOS/app_store_connect_fastlane_api_key.json",
       "destination": "~/.configure/simplenote-ios/secrets/app_store_connect_fastlane_api_key.json",

.github/workflows/run-danger.yml

@@ -0,0 +1,17 @@
+name: ☢️ Trigger Danger On Buildkite
+
+on:
+  pull_request:
+    types: [labeled, unlabeled, milestoned, demilestoned, ready_for_review]
+
+jobs:
+  dangermattic:
+    if: ${{ (github.event.pull_request.draft == false) }}
+    uses: Automattic/dangermattic/.github/workflows/[email protected]
+    with:
+      org-slug: "automattic"
+      pipeline-slug: "simplenote-ios"
+      retry-step-key: "danger"
+      build-commit-sha: "${{ github.event.pull_request.head.sha }}"
+    secrets:
+      buildkite-api-token: ${{ secrets.TRIGGER_BK_BUILD_TOKEN }}

.rubocop.yml

@@ -0,0 +1,29 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - DerivedData/**/*
+    - Pods/**/*
+    - vendor/**/*
+  NewCops: enable
+  SuggestExtensions:
+    rubocop-rake: false
+
+Metrics/MethodLength:
+  Max: 30
+
+Layout/LineLength:
+  Max: 180
+
+Metrics/BlockLength:
+  Exclude: &xfiles
+    - fastlane/Fastfile
+    - fastlane/lanes/*.rb
+    - Rakefile
+
+Style/HashSyntax:
+  EnforcedShorthandSyntax: never
+# Used by UI test account methods. See https://github.com/Automattic/simplenote-ios/pull/1275 for more details.
+Style/GlobalVars:
+  AllowedVariables:
+    - $used_test_account_index

.rubocop_todo.yml

@@ -0,0 +1,40 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2024-02-20 18:18:24 UTC using RuboCop version 1.60.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'fastlane/Fastfile'
+
+# Offense count: 6
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'fastlane/Fastfile'
+
+# Offense count: 2
+Lint/NonLocalExitFromIterator:
+  Exclude:
+    - 'Scripts/update-translations.rb'
+
+# Offense count: 1
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
+  Exclude:
+    - 'Scripts/update-translations.rb'
+
+# Offense count: 9
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Exclude:
+    - 'fastlane/Fastfile'