Skip to content

Commit

Permalink
Fix dirty SCM (#3624)
Browse files Browse the repository at this point in the history
* 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 8513c0b.

* Leave the git status check for sanity later.
  • Loading branch information
JBassett authored Jun 30, 2023
1 parent bd7c02c commit b0a7641
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/actions/download-translations/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 6 additions & 0 deletions .github/workflows/onPush.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b0a7641

Please sign in to comment.