Skip to content

Commit

Permalink
Merge pull request #60 from beomjo/1.0.4/merge-develop-into-main
Browse files Browse the repository at this point in the history
Merge develop into main branch
  • Loading branch information
beomjo authored Jul 26, 2021
2 parents 75cafb7 + 2b71e9f commit de1a8e7
Show file tree
Hide file tree
Showing 30 changed files with 468 additions and 283 deletions.
65 changes: 50 additions & 15 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ on:
# branches: [ main, develop ]
pull_request:
branches: [ main, develop ]
schedule:
- cron: '* 7 * * *'

jobs:
unit_test:
name: UnitTest
android_lint:
name: AndroidLint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -25,15 +27,8 @@ jobs:
- name: Clone Submodule
run: git clone https://github.com/beomjo/android-compilation.git

- name: Unit Test
run: ./gradlew testDebugUnitTest

- name: Android Test Report
uses: asadmansr/[email protected]
if: ${{ always() }}
with:
name: reports
path: app/build/test-results
- name: Run Android Lint
run: ./gradlew lintRelease

- name: Workflow Failed Notification to Slack
uses: rtCamp/action-slack-notify@v2
Expand All @@ -47,10 +42,8 @@ jobs:
SLACK_USERNAME: Github Notification
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}


ktlint:
name: ktlint
needs: unit_test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -85,7 +78,6 @@ jobs:

detekt:
name: detekt
needs: [ unit_test, ktlint ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -117,9 +109,52 @@ jobs:
SLACK_USERNAME: Github Notification
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}


unit_test:
name: UnitTest
needs: [ android_lint, ktlint, detekt ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: set up JDK 8
uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Clone Submodule
run: git clone https://github.com/beomjo/android-compilation.git

- name: Unit Test
run: ./gradlew testDebugUnitTest

- name: Android Test Report
uses: asadmansr/[email protected]
if: ${{ always() }}
with:
name: reports
path: app/build/test-results

- name: Workflow Failed Notification to Slack
uses: rtCamp/action-slack-notify@v2
if: ${{ failure() }}
env:
SLACK_CHANNEL: github-notification
SLACK_COLOR: ${{ job.status }}
SLACK_ICON: https://user-images.githubusercontent.com/39984656/126071498-60496f8c-4971-4bb1-9609-2cab573c1079.png
SLACK_MESSAGE: '[${{ github.workflow }}.${{ github.action }}] Failed!! :rage:'
SLACK_TITLE: Message
SLACK_USERNAME: Github Notification
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}


build:
name: Build
needs: [ unit_test, ktlint, detekt ]
needs: [ android_lint, ktlint, detekt, unit_test ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/upload_aab_to_play_store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ jobs:
- name: Clean Project
run: ./gradlew clean --stacktrace

- name: Run Android Lint
run: ./gradlew lintRelease

- name: Run ktlint
run: ./gradlew ktlintCheck

- name: Run detekt
run: ./gradlew detekt

- name: Unit Test
run: ./gradlew testDebugUnitTest

Expand All @@ -64,12 +73,6 @@ jobs:
name: reports
path: app/build/test-results # path to where the xml test results are stored

- name: Run ktlint
run: ./gradlew ktlintCheck

- name: Run detekt
run: ./gradlew detekt

- name: Build AAB
run: ./gradlew bundleRelease --stacktrace

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ local.properties
.idea/gradle.xml
.idea/vcs.xml
.idea
.idea/
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/compiler.xml

This file was deleted.

25 changes: 0 additions & 25 deletions .idea/jarRepositories.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/misc.xml

This file was deleted.

162 changes: 0 additions & 162 deletions app/build.gradle

This file was deleted.

Loading

0 comments on commit de1a8e7

Please sign in to comment.