diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml index 7b4232938..b9d160ca8 100644 --- a/.github/workflows/android_ci.yml +++ b/.github/workflows/android_ci.yml @@ -1,20 +1,19 @@ -name: NAAGA ANDROID CI1 +name: NAAGA ANDROID CI on: push: branches: - 'feat/**' pull_request: - branches: [ develop ] - -defaults: - run: - working-directory: ./android + branches: [ dev ] jobs: ktlint: name: Run ktlint check runs-on: ubuntu-latest + defaults: + run: + working-directory: ./android steps: - uses: actions/checkout@v3 @@ -37,11 +36,14 @@ jobs: run: chmode +x gradlew - name: Run ktlint - run: ./android/gradlew ktlintCheck + run: ./gradlew ktlintCheck build: name: build runs-on: ubuntu-latest + defaults: + run: + working-directory: ./android steps: - uses: actions/checkout@v3 @@ -64,11 +66,14 @@ jobs: run: chmode +x gradlew - name: Run Build - run: ./android/gradlew assembleDebug + run: ./gradlew assembleDebug test: name: test runs-on: ubuntu-latest + defaults: + run: + working-directory: ./android steps: - uses: actions/checkout@v3 @@ -91,4 +96,4 @@ jobs: run: chmode +x gradlew - name: Run Build - run: ./android/gradlew testDebugUnitTest \ No newline at end of file + run: ./gradlew testDebugUnitTest \ No newline at end of file diff --git a/.github/workflows/android_ci2.yml.txt b/.github/workflows/android_ci2.yml.txt deleted file mode 100644 index 87c5f11df..000000000 --- a/.github/workflows/android_ci2.yml.txt +++ /dev/null @@ -1,45 +0,0 @@ -name: NAAGA ANDROID CI2 - -on: - push: - branches: - - 'feat/**' - pull_request: - branches: [ develop ] - -defaults: - run: - working-directory: ./android - - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - cache: gradle - - - name: Change wrapper permissions - run: chmod +x ./android/gradlew - - - name: Run ktlintChecking - run: ./android/gradlew -p android ktlintCheck - - - name: Run unit tests - run: ./android/gradlew -p android testDebugUnitTest - - - name: Build assemble release apk - run: ./android/gradlew -p android assembleRelease - - - name: Create android test report - uses: asadmansr/android-test-report-action@v1.2.0 - if: ${{ always() }} - - - name: Build assemble release apk - run: ./android/gradlew -p android assembleRelease \ No newline at end of file