Merge pull request #10459 from nextcloud/repo-sync/android-common/master

🔄 Synced file(s) with nextcloud/android-common

.github/workflows/detectNewJavaFiles.yml

@@ -4,15 +4,29 @@ on:
   pull_request:
     branches: [ master, stable-* ]
 
-# Declare default permissions as read only.
 permissions: read-all
 
 jobs:
   detectNewJavaFiles:
     runs-on: ubuntu-latest
-
     steps:
-            -   uses: trilom/file-changes-action@v1.2.4
+      -   id: file_changes
-            -   uses: actions/checkout@v2
+          uses: trilom/file-changes-action@v1.2.4
+          with:
+            output: ','
       -   name: Detect new java files
-                run: scripts/analysis/detectNewJavaFiles.sh
+          run: |
+            if [ -z '${{ steps.file_changes.outputs.files_added }}' ]; then
+                echo "No new files added"
+                exit 0
+            fi
+            new_java=$(echo '${{ steps.file_changes.outputs.files_added }}' | tr ',' '\n' | grep '\.java$' | cat)
+            if [ -n "$new_java" ]; then
+                # shellcheck disable=SC2016
+                printf 'New java files detected:\n```\n%s\n```\n' "$new_java" | tee "$GITHUB_STEP_SUMMARY"
+                exit 1
+            else
+                echo "No new java files detected"
+                exit 0
+            fi
+

scripts/analysis/detectNewJavaFiles.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-count=$(grep \.java\" -c "$HOME"/files_added.json)
-
-if [ "$count" -eq 0 ] ; then
-    exit 0
-else
-    echo "New Java files detected! Please use Kotlin for new files. Number of new Java files: $count"
-    exit 1
-fi
-