diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 508abf1e0..fd4fd1c47 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -5,7 +5,7 @@ on: branches: [ master ] jobs: - assemble: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -14,37 +14,16 @@ jobs: with: distribution: 'adopt' java-version: 17 + - name: setup gradle cache + uses: gradle/actions/setup-gradle@v3 + with: + cache-read-only: false - name: run assemble run: ./gradlew assemble - - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: set up JDK 17 - uses: actions/setup-java@v4 - with: - distribution: 'adopt' - java-version: 17 - name: run kover run: ./gradlew koverMergedXmlReport - uses: codecov/codecov-action@v4 - - analyze: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: set up JDK 17 - uses: actions/setup-java@v4 - with: - distribution: 'adopt' - java-version: 17 - - name: run lintDebug + - name: run lint run: ./gradlew :app:lint - name: run detektCheck run: ./gradlew detektCheck - - name: upload linting results - uses: actions/upload-artifact@v4 - with: - name: lint - path: build/reports/ diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 8bc1c7ab9..c960c3780 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -13,6 +13,8 @@ jobs: with: distribution: 'adopt' java-version: 17 + - name: setup gradle cache + uses: gradle/actions/setup-gradle@v3 - name: run assemble run: ./gradlew assemble @@ -25,9 +27,18 @@ jobs: with: distribution: 'adopt' java-version: 17 + - name: setup gradle cache + uses: gradle/actions/setup-gradle@v3 - name: run kover run: ./gradlew koverMergedXmlReport - uses: codecov/codecov-action@v4 + - name: publish results + uses: EnricoMi/publish-unit-test-result-action@v2 + if: always() + with: + files: ./**/build/test-results/**/*.xml + action_fail: true + action_fail_on_inconclusive: true ktlint: runs-on: ubuntu-latest @@ -38,6 +49,8 @@ jobs: with: distribution: 'adopt' java-version: 17 + - name: setup gradle cache + uses: gradle/actions/setup-gradle@v3 - name: run ktlintCheck run: ./gradlew ktlintCheck @@ -52,6 +65,8 @@ jobs: with: distribution: 'adopt' java-version: 17 + - name: setup gradle cache + uses: gradle/actions/setup-gradle@v3 - name: run lint run: ./gradlew :app:lint - name: run detektCheck diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 942082d8d..8491b65fe 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -4,6 +4,6 @@