Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dirty SCM #3624

Merged
merged 4 commits into from
Jun 30, 2023
Merged

Fix dirty SCM #3624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8513c0b
Add `git status` check to determine what's dirty.
JBassett Jun 30, 2023
3bcc09a
Put the locale stuff in the app/wear folders rather than common with …
JBassett Jun 30, 2023
bec2868
Revert "Add `git status` check to determine what's dirty."
JBassett Jun 30, 2023
834085d
Leave the git status check for sanity later.
JBassett Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/actions/download-translations/action.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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