diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 5ccd00a02b..c72a29812e 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -14,6 +14,7 @@ jobs:
- name: Run code quality check suite
run: ./tools/check/check_code_quality.sh
+# ktlint for all the modules
ktlint:
name: Kotlin Linter
runs-on: ubuntu-latest
@@ -23,12 +24,55 @@ jobs:
run: |
./gradlew ktlintCheck --continue
- name: Upload reports
+ if: always()
uses: actions/upload-artifact@v2
with:
name: ktlinting-report
- path: vector/build/reports/ktlint/*.*
+ path: |
+ */build/reports/ktlint/ktlint*/ktlint*.txt
+ - name: Handle Results
+ if: always()
+ id: get-comment-body
+ run: |
+ results="$(cat */*/build/reports/ktlint/ktlint*/ktlint*.txt */build/reports/ktlint/ktlint*/ktlint*.txt | sed -r "s/\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[mGK]//g")"
+ if [ -z "$results" ]; then
+ body="👍 ✅ 👍"
+ else
+ body="👎 ❌ 👎 \`Failed${results}\`"
+ body="${body//'%'/'%25'}"
+ body="${body//$'\n'/'%0A'}"
+ body="${body//$'\r'/'%0D'}"
+ body="$( echo $body | sed 's/\/home\/runner\/work\/element-android\/element-android\//\`
\`/g')"
+ body="$( echo $body | sed 's/\/src\/main\/java\// 🔸 /g')"
+ body="$( echo $body | sed 's/im\/vector\/app\///g')"
+ body="$( echo $body | sed 's/im\/vector\/lib\/attachmentviewer\///g')"
+ body="$( echo $body | sed 's/im\/vector\/lib\/multipicker\///g')"
+ body="$( echo $body | sed 's/im\/vector\/lib\///g')"
+ body="$( echo $body | sed 's/org\/matrix\/android\/sdk\///g')"
+ body="$( echo $body | sed 's/\/src\/androidTest\/java\// 🔸 /g')"
+ fi
+ echo "::set-output name=body::$body"
+ - name: Find Comment
+ if: always()
+ uses: peter-evans/find-comment@v1
+ id: fc
+ with:
+ issue-number: ${{ github.event.pull_request.number }}
+ comment-author: 'github-actions[bot]'
+ body-includes: Ktlint Results
+ - name: Publish ktlint results to PR
+ if: always()
+ uses: peter-evans/create-or-update-comment@v1
+ with:
+ comment-id: ${{ steps.fc.outputs.comment-id }}
+ issue-number: ${{ github.event.pull_request.number }}
+ body: |
+ ### Ktlint Results
-# Lint for main module and all the other modules
+ ${{ steps.get-comment-body.outputs.body }}
+ edit-mode: replace
+
+# Lint for main module
android-lint:
name: Android Linter
runs-on: ubuntu-latest
@@ -74,7 +118,6 @@ jobs:
run: ./gradlew clean lint${{ matrix.target }}Release --stacktrace
- name: Upload ${{ matrix.target }} linting report
uses: actions/upload-artifact@v2
- if: always()
with:
name: release-lint-report-${{ matrix.target }}
path: |
diff --git a/changelog.d/4864.misc b/changelog.d/4864.misc
new file mode 100644
index 0000000000..05890ae1c6
--- /dev/null
+++ b/changelog.d/4864.misc
@@ -0,0 +1 @@
+Fix github actions ktlint reports and publish results on PR as comment
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java
index 26920fbb35..18de66e69e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java
@@ -208,4 +208,4 @@ public final class LiveDataTestObserver implements Observer {
liveData.observeForever(observer);
return observer;
}
-}
\ No newline at end of file
+}
\ No newline at end of file