From e4f7746d85402698dcf8cdf0d51011401e48750d Mon Sep 17 00:00:00 2001
From: Marcelo Jacobus <marcelo.jacobus@gmail.com>
Date: Thu, 23 Sep 2021 12:50:47 -0300
Subject: [PATCH 1/2] Fix broken crowdin sync action (#21624)

---
 .github/allowed-actions.js    | 2 +-
 .github/workflows/crowdin.yml | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js
index 73a20fe4cc..b9d9f05dd8 100644
--- a/.github/allowed-actions.js
+++ b/.github/allowed-actions.js
@@ -12,7 +12,7 @@ export default [
   'actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074', // v2.2.4
   'alex-page/github-project-automation-plus@fdb7991b72040d611e1123d2b75ff10eda9372c9',
   'andymckay/labeler@22d5392de2b725cea4b284df5824125054049d84',
-  'crowdin/github-action@fd9429dd63d6c0f8a8cb4b93ad8076990bd6e688',
+  'crowdin/github-action@d7f217268068f1244883a993379d62d816f84f25', // v1.4.0
   'crykn/copy_folder_to_another_repo_action@0282e8b9fef06de92ddcae9fe6cb44df6226646c',
   'cschleiden/actions-linter@caffd707beda4fc6083926a3dff48444bc7c24aa', // uses github-actions-parser v0.23.0
   'dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911', // v3.0.2
diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
index eaff2762cf..395005ddfb 100644
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -17,9 +17,15 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        with:
+          fetch-depth: 0
+          lfs: true
+
+      - name: Remove unwanted git hooks
+        run: rm .git/hooks/post-checkout
 
       - name: Sync
-        uses: crowdin/github-action@fd9429dd63d6c0f8a8cb4b93ad8076990bd6e688
+        uses: crowdin/github-action@d7f217268068f1244883a993379d62d816f84f25
         with:
           upload_translations: false
           download_translations: true

From e29a965405645add1778aeeb0bc61f1f9fe4aa4c Mon Sep 17 00:00:00 2001
From: "James M. Greene" <JamesMGreene@github.com>
Date: Thu, 23 Sep 2021 10:51:50 -0500
Subject: [PATCH 2/2] Display the reason for Heroku AppSetup failure (#21683)

---
 script/deployment/deploy-to-staging.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/script/deployment/deploy-to-staging.js b/script/deployment/deploy-to-staging.js
index 209f072715..1de24930ff 100644
--- a/script/deployment/deploy-to-staging.js
+++ b/script/deployment/deploy-to-staging.js
@@ -241,10 +241,17 @@ export default async function deployToStaging({
         }
 
         if (appSetup && appSetup.status === 'failed') {
+          const manifestErrors = appSetup.manifest_errors || []
+          const hasManifestErrors = Array.isArray(manifestErrors) && manifestErrors.length > 0
+          const manifestErrorMessage = hasManifestErrors
+            ? `\nManifest errors:\n - ${manifestErrors.join('\n - ')}`
+            : ''
           throw new Error(
             `Failed to setup app after ${Math.round(
               (Date.now() - appSetupStartTime) / 1000
-            )} seconds. See Heroku logs for more information:\n${logUrl}`
+            )} seconds.
+Reason: ${appSetup.failure_message}${manifestErrorMessage}
+See Heroku logs for more information:\n${logUrl}`
           )
         }