Merge branch 'Automattic:main' into main

Author: joashrajin

.buildkite/commands/prototype-build-fad.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -eu
+
+"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :hammer_and_wrench: Building"
+bundle exec fastlane build_and_upload_prototype_build_fad

.buildkite/pipeline.yml

@@ -27,27 +27,27 @@ steps:
 
       - label: 'Lint'
         command: ".buildkite/commands/lint.sh"
-        plugins: [$CI_TOOLKIT]
+        plugins: [ $CI_TOOLKIT ]
         artifact_paths:
           - "**/build/reports/lint-results*.*"
 
   - label: 'Unit tests'
     command: ".buildkite/commands/run-unit-tests.sh"
-    plugins: [$CI_TOOLKIT]
+    plugins: [ $CI_TOOLKIT ]
 
   - group: "Diff Reports"
     steps:
       - label: 'Dependency diff'
         if: build.pull_request.id != null
         command: comment_with_dependency_diff 'app' 'releaseRuntimeClasspath'
-        plugins: [$CI_TOOLKIT]
+        plugins: [ $CI_TOOLKIT ]
         artifact_paths:
           - "**/build/reports/diff/*"
 
       - label: "Merged Manifest Diff"
         command: ".buildkite/commands/diff-merged-manifest.sh release"
         if: build.pull_request.id != null
-        plugins: [$CI_TOOLKIT]
+        plugins: [ $CI_TOOLKIT ]
         artifact_paths:
           - "**/build/reports/diff_manifest/**/**/*"
 
@@ -59,11 +59,11 @@ steps:
 
       echo "--- 🔎 Checking formatting with Spotless"
       ./gradlew spotlessCheck
-    plugins: [$CI_TOOLKIT]
+    plugins: [ $CI_TOOLKIT ]
 
   - label: "Instrumented tests"
     command: ".buildkite/commands/run-instrumented-tests.sh"
-    plugins: [$CI_TOOLKIT]
+    plugins: [ $CI_TOOLKIT ]
     artifact_paths:
       - "**/build/instrumented-tests/**/*"
 
@@ -87,10 +87,36 @@ steps:
         artifact_paths:
           - "**/build/outputs/apk/**/*"
 
-  - label: "Prototype Builds"
+    ##########
+    # Optional Prototype Builds for PR branches, distributed via S3
+    ##########
+  - group: Prototype Builds
     if: "build.pull_request.id != null"
-    command: |
-      ".buildkite/commands/prototype-build.sh"
-    plugins: [ $CI_TOOLKIT ]
-    artifact_paths:
-      - "**/build/outputs/apk/**/*"
+    steps:
+      - input: "🚀 Generate Prototype Builds?"
+        prompt: Generate Prototype Builds on the PR?
+        key: prototype_builds_triggered
+      - label: ":github: Prototype Builds"
+        depends_on: prototype_builds_triggered
+        command: |
+          ".buildkite/commands/prototype-build.sh"
+        plugins: [ $CI_TOOLKIT ]
+        artifact_paths:
+          - "**/build/outputs/apk/**/*"
+
+    ##########
+    # Optional Prototype Builds for main branch, distributed via FAD
+    ##########
+  - group: Prototype Builds (FAD)
+    if: "build.branch == 'main'"
+    steps:
+      - input: ":rocket: Generate Prototype Builds (FAD)?"
+        prompt: Generate Prototype Builds via Firebase App Distribution (FAD)?
+        key: prototype_builds_fad_triggered
+      - label: ":firebase: Prototype Builds (FAD)"
+        depends_on: prototype_builds_fad_triggered
+        command: |
+          ".buildkite/commands/prototype-build-fad.sh"
+        plugins: [ $CI_TOOLKIT ]
+        artifact_paths:
+          - "app/build/outputs/apk/**/*"

.buildkite/release-builds.yml

@@ -24,5 +24,6 @@ steps:
     plugins: [$CI_TOOLKIT]
     artifact_paths:
       - "**/build/reports/lint-results*.*"
+      - "artifacts/**"
     notify:
       - slack: "#build-and-ship"

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

@@ -16,7 +16,7 @@ steps:
       bundle exec fastlane run configure_apply
 
       echo '--- ❄️ Code Freeze'
-      bundle exec fastlane code_freeze skip_confirm:true
+      bundle exec fastlane code_freeze version:"${RELEASE_VERSION}" skip_confirm:true
     plugins: [$CI_TOOLKIT]
     agents:
       queue: "tumblr-metal"

.buildkite/release-pipelines/publish-release.yml

@@ -8,9 +8,6 @@
 steps:
   - label: "🚂 Update Rollouts"
     command: |
-      echo '--- 🤖 Use bot for Git operations'
-      source use-bot-for-git
-
       echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
@@ -26,3 +23,23 @@ steps:
       manual:
         allowed: false
         reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"
+
+  - label: ":github: Publish Draft GitHub Release"
+    if: build.env("PUBLISH_DRAFT_GITHUB_RELEASE") == "true"
+    command: |
+      echo '--- 🤖 Use bot for Git operations'
+      # Needed because if `track:production` then the publish_gh_release lane will also delete the release branch
+      source use-bot-for-git
+
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
+
+      echo '--- 🚀 Publish Draft GitHub Release'
+      bundle exec fastlane publish_gh_release skip_confirm:true track:"$TRACK"
+    plugins: [$CI_TOOLKIT]
+    agents:
+      queue: "tumblr-metal"
+    retry:
+      manual:
+        allowed: false
+        reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

.buildkite/release-pipelines/update-rollouts.yml

@@ -1,7 +1,7 @@
 {
   "project_name": "pocketcasts-android",
   "branch": "trunk",
-  "pinned_hash": "3c106f58829564e7c402598cf4b6e97407fec5bb",
+  "pinned_hash": "c548b505ffe4342e31be28edc92c5a058fbf1410",
   "files_to_copy": [
     {
       "file": "android/pocket-casts/secret.properties",

.configure

@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/actions/wrapper-validation@v4
+      - uses: actions/checkout@v5
+      - uses: gradle/actions/wrapper-validation@v5

.configure-files/secret.properties.enc

@@ -12,12 +12,15 @@ jobs:
     steps:
       - name: Check for "[Priority] High" Label
         id: check_label
+        env:
+          issue_or_pr_title: "${{ github.event.issue.title || github.event.pull_request.title }}"
+          issue_or_pr_author: "${{ github.event.issue.user.login || github.event.pull_request.user.login }}"
         run: |
           if [[ "${{ github.event.label.name }}" == "[Priority] High" ]]; then
             echo "SEND_SLACK=true" >> $GITHUB_ENV
             echo "TYPE=${{ github.event_name == 'issues' && 'Issue' || 'Pull Request' }}" >> $GITHUB_ENV
-            echo "LINK=<${{ github.event.issue.html_url || github.event.pull_request.html_url }}|${{ github.event.issue.title || github.event.pull_request.title }}>" >> $GITHUB_ENV
-            echo "AUTHOR=${{ github.event.issue.user.login || github.event.pull_request.user.login }}" >> $GITHUB_ENV
+            echo "LINK=<${{ github.event.issue.html_url || github.event.pull_request.html_url }}|$issue_or_pr_title>" >> $GITHUB_ENV
+            echo "AUTHOR=$issue_or_pr_author" >> $GITHUB_ENV
             echo "NUMBER=${{ github.event.issue.number || github.event.pull_request.number }}" >> $GITHUB_ENV
           else
             echo "SEND_SLACK=false" >> $GITHUB_ENV