Skip to content

Commit

Permalink
Feature/wear publishing (#1264)
Browse files Browse the repository at this point in the history
* Cleanup .gitignore

* Move to just wear rather than wearos_app.

* Try to use lots of wildcards for debug pr build archiving.
  • Loading branch information
JBassett committed Dec 28, 2020
1 parent 1ddd093 commit 3b61454
Show file tree
Hide file tree
Showing 31 changed files with 29 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/actions/inflate-secrets/action.yml
Expand Up @@ -28,15 +28,15 @@ runs:
KEYSTORE: ${{ inputs.keystore }}
run: |
echo $KEYSTORE | base64 --decode > app/release_keystore.keystore
echo $KEYSTORE | base64 --decode > wearos_app/release_keystore.keystore
echo $KEYSTORE | base64 --decode > wear/release_keystore.keystore
- name: Inflate google-services.json
shell: bash
env:
GOOGLE_SERVICES: ${{ inputs.google-services }}
run: |
echo $GOOGLE_SERVICES > app/google-services.json
echo $GOOGLE_SERVICES > wearos_app/google-services.json
echo $GOOGLE_SERVICES > wear/google-services.json
- name: Inflate firebaseAppDistributionServiceCredentialsFile.json
shell: bash
Expand All @@ -51,4 +51,4 @@ runs:
CREDS: ${{ inputs.playstore-creds }}
run: |
echo $CREDS > app/playStorePublishServiceCredentialsFile.json
echo $CREDS > wearos_app/playStorePublishServiceCredentialsFile.json
echo $CREDS > wear/playStorePublishServiceCredentialsFile.json
10 changes: 10 additions & 0 deletions .github/workflows/beta.yml
Expand Up @@ -85,6 +85,16 @@ jobs:
asset_name: home-assistant-minimal-${{steps.rel_number.outputs.version}}.apk
asset_content_type: application/zip

- name: Upload Wear APK
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./wear/build/outputs/apk/release/wear-release.apk
asset_name: home-assistant-wear-${{steps.rel_number.outputs.version}}.apk
asset_content_type: application/zip

- name: Deploy to Firebase
env:
KEYSTORE_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_FILE_PASSWORD }}
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/pr.yml
Expand Up @@ -24,7 +24,9 @@ jobs:
${{ runner.os }}-gradle-
- name: Mock google-services.json
run: mv .github/mock-google-services.json app/google-services.json
run: |
cp .github/mock-google-services.json app/google-services.json
cp .github/mock-google-services.json wear/google-services.json
- name: Validate ktlint
run: ./gradlew ktlintCheck
Expand All @@ -48,7 +50,9 @@ jobs:
${{ runner.os }}-gradle-
- name: Mock google-services.json
run: mv .github/mock-google-services.json app/google-services.json
run: |
cp .github/mock-google-services.json app/google-services.json
cp .github/mock-google-services.json wear/google-services.json
- name: Validate Lint
run: ./gradlew lint
Expand All @@ -72,7 +76,9 @@ jobs:
${{ runner.os }}-gradle-
- name: Mock google-services.json
run: mv .github/mock-google-services.json app/google-services.json
run: |
cp .github/mock-google-services.json app/google-services.json
cp .github/mock-google-services.json wear/google-services.json
- name: Validate Tests
run: ./gradlew test
Expand All @@ -96,13 +102,14 @@ jobs:
${{ runner.os }}-gradle-
- name: Mock google-services.json
run: mv .github/mock-google-services.json app/google-services.json
run: |
cp .github/mock-google-services.json app/google-services.json
cp .github/mock-google-services.json wear/google-services.json
- name: Build Debug APK
run: ./gradlew assembleDebug

- name: Archive Debug Build
uses: kittaakos/upload-artifact-as-is@v0
with:
path: ./app/build/outputs/apk/*/debug/*-debug.apk

path: ./**/*.apk
3 changes: 2 additions & 1 deletion .gitignore
@@ -1,8 +1,9 @@
.DS_Store

local.properties
google-services.json

*.iml
.idea/
.gradle/
build/
build/
1 change: 0 additions & 1 deletion app/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion buildSrc/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion settings.gradle.kts
@@ -1,6 +1,6 @@
import org.gradle.kotlin.dsl.support.serviceOf

include(":common", ":app", ":wearos_app")
include(":common", ":app", ":wear")

rootProject.name = "home-assistant-android"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 3b61454

Please sign in to comment.