From b0a7641a1a3ff89fcea901b043521e00aa848642 Mon Sep 17 00:00:00 2001
From: Justin Bassett <bassett.justint@gmail.com>
Date: Fri, 30 Jun 2023 17:09:13 -0400
Subject: [PATCH] Fix dirty SCM (#3624)

* Add `git status` check to determine what's dirty.

* Put the locale stuff in the app/wear folders rather than common with the real data.

* Revert "Add `git status` check to determine what's dirty."

This reverts commit 8513c0b09f8706683a4aa3f3b88b0536315d3b87.

* Leave the git status check for sanity later.
---
 .github/actions/download-translations/action.yml | 3 ++-
 .github/workflows/onPush.yml                     | 6 ++++++
 .gitignore                                       | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/actions/download-translations/action.yml b/.github/actions/download-translations/action.yml
index 39627ab54..a982d288a 100644
--- a/.github/actions/download-translations/action.yml
+++ b/.github/actions/download-translations/action.yml
@@ -47,6 +47,7 @@ runs:
           if [ "$CODE" == "values" ]; then CODE="en"; fi
           XML_LOCALES="$XML_LOCALES    <locale android:name=\"$CODE\"/>\n"
         done
-        printf "$XML_START$XML_LOCALES$XML_END" > common/src/main/res/xml/locales_config.xml
+        printf "$XML_START$XML_LOCALES$XML_END" > app/src/main/res/xml/locales_config.xml
+        printf "$XML_START$XML_LOCALES$XML_END" > wear/src/main/res/xml/locales_config.xml
         
         echo "Complete"
diff --git a/.github/workflows/onPush.yml b/.github/workflows/onPush.yml
index 1648544dd..126174924 100644
--- a/.github/workflows/onPush.yml
+++ b/.github/workflows/onPush.yml
@@ -89,6 +89,9 @@ jobs:
           VERSION_CODE: ${{ steps.rel_number.outputs.version-code }}
         run: ./gradlew appDistributionUploadFullRelease
 
+      - name: Print `git status`
+        run: git status
+
   play_publish:
     name: Play Publish
     runs-on: ubuntu-latest
@@ -163,3 +166,6 @@ jobs:
         run: |
           ./gradlew :wear:promoteReleaseBundle :app:promoteReleaseBundle
           ./gradlew :automotive:promoteReleaseBundle || echo "Failed to promote Automotive!"
+
+      - name: Print `git status`
+        run: git status
diff --git a/.gitignore b/.gitignore
index 9154c8206..1967ac1e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,8 @@ version.txt
 # Make sure our translation downloads don't make our repo dirty when building.
 strings.zip
 common/src/main/res/*/strings.xml
-common/src/main/res/xml/locales_config.xml
+app/src/main/res/xml/locales_config.xml
+wear/src/main/res/xml/locales_config.xml
 !common/src/main/res/values/strings.xml
 
 firebaseAppDistributionServiceCredentialsFile.json