fix conflicts

Author: mebarbosa

.buildkite/commands/diff-merged-manifest.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -euo pipefail
+
+"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
+
+BUILD_VARIANT=$1
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- 💾 Diff Merged Manifest (Module: app, Build Variant: ${BUILD_VARIANT})"
+comment_with_manifest_diff "app" ${BUILD_VARIANT}
+
+echo "--- 💾 Diff Merged Manifest (Module: wear, Build Variant: ${BUILD_VARIANT})"
+comment_with_manifest_diff "wear" ${BUILD_VARIANT}
+
+echo "--- 💾 Diff Merged Manifest (Module: automotive, Build Variant: ${BUILD_VARIANT})"
+comment_with_manifest_diff "automotive" ${BUILD_VARIANT}

.buildkite/pipeline.yml

@@ -35,12 +35,21 @@ steps:
     command: ".buildkite/commands/run-unit-tests.sh"
     plugins: [$CI_TOOLKIT]
 
-  - label: 'Dependency diff'
-    if: build.pull_request.id != null
-    command: comment_with_dependency_diff 'app' 'releaseRuntimeClasspath'
-    plugins: [$CI_TOOLKIT]
-    artifact_paths:
-      - "**/build/reports/diff/*"
+  - group: "Diff Reports"
+    steps:
+      - label: 'Dependency diff'
+        if: build.pull_request.id != null
+        command: comment_with_dependency_diff 'app' 'releaseRuntimeClasspath'
+        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]
+        artifact_paths:
+          - "**/build/reports/diff_manifest/**/**/*"
 
   - label: 'Spotless formatting check'
     command: |

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

@@ -22,5 +22,5 @@ steps:
       queue: "tumblr-metal"
     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
+        reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

.buildkite/release-pipelines/download-translations.yml

@@ -0,0 +1,26 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+# This pipeline is meant to be triggered by the MC scenario in ReleasesV2
+
+steps:
+  - label: "🚂 Download Translations"
+    command: |
+      echo '--- 🤖 Use bot for Git operations'
+      source use-bot-for-git
+
+      echo '--- :ruby: Setup Ruby Tools'
+      install_gems
+
+      echo '--- 🔐 Access Secrets'
+      bundle exec fastlane run configure_apply
+
+      echo '--- 🚀 Download Translations'
+      bundle exec fastlane download_translations
+    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/finalize-hotfix-release.yml

@@ -24,5 +24,5 @@ steps:
       queue: "tumblr-metal"
     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
+        reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

.buildkite/release-pipelines/finalize-release.yml

@@ -18,11 +18,11 @@ steps:
       bundle exec fastlane run configure_apply
 
       echo '--- 🚀 Finalize Release'
-      bundle exec fastlane finalize_release skip_confirm:true
+      bundle exec fastlane finalize_release skip_confirm:true skip_translations_download:true
     plugins: [$CI_TOOLKIT]
     agents:
       queue: "tumblr-metal"
     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
+        reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

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

@@ -24,5 +24,5 @@ steps:
       queue: "tumblr-metal"
     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
+        reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

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

@@ -22,5 +22,5 @@ steps:
       queue: "tumblr-metal"
     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
+        reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

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

@@ -24,5 +24,5 @@ steps:
       queue: "tumblr-metal"
     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
+        reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"

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

@@ -24,5 +24,5 @@ steps:
       queue: "tumblr-metal"
     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
+        reason: "Always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite"