mirror of
https://github.com/home-assistant/android
synced 2024-07-08 20:05:52 +00:00
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 8513c0b09f
.
* Leave the git status check for sanity later.
This commit is contained in:
parent
bd7c02c30d
commit
b0a7641a1a
|
@ -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
.github/workflows/onPush.yml
vendored
6
.github/workflows/onPush.yml
vendored
|
@ -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
|
||||
|
|
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user