Skip to content

Commit de1a8e7

Browse files
authored
Merge pull request #60 from beomjo/1.0.4/merge-develop-into-main
Merge develop into main branch
2 parents 75cafb7 + 2b71e9f commit de1a8e7

30 files changed

+468
-283
lines changed

.github/workflows/android.yml

Lines changed: 50 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55
# branches: [ main, develop ]
66
pull_request:
77
branches: [ main, develop ]
8+
schedule:
9+
- cron: '* 7 * * *'
810

911
jobs:
10-
unit_test:
11-
name: UnitTest
12+
android_lint:
13+
name: AndroidLint
1214
runs-on: ubuntu-latest
1315
steps:
1416
- uses: actions/checkout@v2
@@ -25,15 +27,8 @@ jobs:
2527
- name: Clone Submodule
2628
run: git clone https://github.com/beomjo/android-compilation.git
2729

28-
- name: Unit Test
29-
run: ./gradlew testDebugUnitTest
30-
31-
- name: Android Test Report
32-
uses: asadmansr/android-test-report-action@v1.2.0
33-
if: ${{ always() }}
34-
with:
35-
name: reports
36-
path: app/build/test-results
30+
- name: Run Android Lint
31+
run: ./gradlew lintRelease
3732

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

50-
5145
ktlint:
5246
name: ktlint
53-
needs: unit_test
5447
runs-on: ubuntu-latest
5548
steps:
5649
- uses: actions/checkout@v2
@@ -85,7 +78,6 @@ jobs:
8578

8679
detekt:
8780
name: detekt
88-
needs: [ unit_test, ktlint ]
8981
runs-on: ubuntu-latest
9082
steps:
9183
- uses: actions/checkout@v2
@@ -117,9 +109,52 @@ jobs:
117109
SLACK_USERNAME: Github Notification
118110
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
119111

112+
113+
unit_test:
114+
name: UnitTest
115+
needs: [ android_lint, ktlint, detekt ]
116+
runs-on: ubuntu-latest
117+
steps:
118+
- uses: actions/checkout@v2
119+
120+
- name: set up JDK 8
121+
uses: actions/setup-java@v2
122+
with:
123+
java-version: '8'
124+
distribution: 'adopt'
125+
126+
- name: Grant execute permission for gradlew
127+
run: chmod +x gradlew
128+
129+
- name: Clone Submodule
130+
run: git clone https://github.com/beomjo/android-compilation.git
131+
132+
- name: Unit Test
133+
run: ./gradlew testDebugUnitTest
134+
135+
- name: Android Test Report
136+
uses: asadmansr/android-test-report-action@v1.2.0
137+
if: ${{ always() }}
138+
with:
139+
name: reports
140+
path: app/build/test-results
141+
142+
- name: Workflow Failed Notification to Slack
143+
uses: rtCamp/action-slack-notify@v2
144+
if: ${{ failure() }}
145+
env:
146+
SLACK_CHANNEL: github-notification
147+
SLACK_COLOR: ${{ job.status }}
148+
SLACK_ICON: https://user-images.githubusercontent.com/39984656/126071498-60496f8c-4971-4bb1-9609-2cab573c1079.png
149+
SLACK_MESSAGE: '[${{ github.workflow }}.${{ github.action }}] Failed!! :rage:'
150+
SLACK_TITLE: Message
151+
SLACK_USERNAME: Github Notification
152+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
153+
154+
120155
build:
121156
name: Build
122-
needs: [ unit_test, ktlint, detekt ]
157+
needs: [ android_lint, ktlint, detekt, unit_test ]
123158
runs-on: ubuntu-latest
124159
steps:
125160
- uses: actions/checkout@v2

.github/workflows/upload_aab_to_play_store.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ jobs:
5454
- name: Clean Project
5555
run: ./gradlew clean --stacktrace
5656

57+
- name: Run Android Lint
58+
run: ./gradlew lintRelease
59+
60+
- name: Run ktlint
61+
run: ./gradlew ktlintCheck
62+
63+
- name: Run detekt
64+
run: ./gradlew detekt
65+
5766
- name: Unit Test
5867
run: ./gradlew testDebugUnitTest
5968

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

67-
- name: Run ktlint
68-
run: ./gradlew ktlintCheck
69-
70-
- name: Run detekt
71-
run: ./gradlew detekt
72-
7376
- name: Build AAB
7477
run: ./gradlew bundleRelease --stacktrace
7578

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ local.properties
1111
.idea/gradle.xml
1212
.idea/vcs.xml
1313
.idea
14+
.idea/

.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/compiler.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/jarRepositories.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

app/build.gradle

Lines changed: 0 additions & 162 deletions
This file was deleted.

0 commit comments

Comments
 (0)