Merge pull request #30 from usefulness/more_pr_checks

Author: mateuszkwiecinski

.github/workflows/after_merge.yml

@@ -23,3 +23,8 @@ jobs:
         with:
           old-file-path: sample-apk.apk
           new-file-path: sample-apk.apk
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: diffuse-output
+          path: ${{ steps.diffuse.outputs.diff-file }}

.github/workflows/main.yml

@@ -4,7 +4,7 @@ on:
 jobs:
   test-apk:
     runs-on: ubuntu-latest
-    name: Run diffuse action
+    name: Run diffuse action (part 1)
     steps:
       - uses: actions/checkout@v2
 
@@ -30,18 +30,17 @@ jobs:
         id: find_comment
         with:
           issue-number: ${{ github.event.pull_request.number }}
-          body-includes: diffuse-smoke-test
+          body-includes: diffuse-smoke-test-1
 
       - uses: peter-evans/create-or-update-comment@v1
-        if: ${{ steps.diffuse.outputs.diff-raw != null || steps.find_comment.outputs.comment-id != null }}
         with:
           body: |
-            ### diffuse-smoke-test
+            ### diffuse-smoke-test-1
 
             `steps.diffuse.outputs.diff-gh-comment:`
             ${{ steps.diffuse.outputs.diff-gh-comment }}
 
-             `steps.diffuse.outputs.summary`
+            `steps.diffuse.outputs.summary`
             ```
             ${{ steps.diffuse.outputs.summary }}
             ```
@@ -55,14 +54,74 @@ jobs:
             ```
             ${{ steps.diffuse.outputs.dex }}
             ```
+          edit-mode: replace
+          comment-id: ${{ steps.find_comment.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: diffuse-output-1
+          path: ${{ steps.diffuse.outputs.diff-file }}
+
+  test-apk-2:
+    runs-on: ubuntu-latest
+    name: Run diffuse action (part 2)
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Get very old version of Andorid Auto app for test purposes
+        run: wget "https://github.com/usefulness/storage/raw/master/audroid-auto-very-old.apk" -O very-old-apk.apk
+
+      - name: Get new version of Andorid Auto app for test purposes
+        run: wget "https://github.com/usefulness/storage/raw/master/android-auto-new.apk" -O new-apk.apk
+
+      - id: diffuse
+        uses: ./
+        with:
+          old-file-path: very-old-apk.apk
+          new-file-path: new-apk.apk
+          debug: true
+
+      - uses: peter-evans/find-comment@v1
+        id: find_comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body-includes: diffuse-smoke-test-2
 
-            (if visible the action works as expected)
+      - uses: peter-evans/create-or-update-comment@v1
+        with:
+          body: |
+            ### diffuse-smoke-test-2
+
+            `steps.diffuse.outputs.diff-gh-comment-no-dex:`
+            ${{ steps.diffuse.outputs.diff-gh-comment-no-dex }}
+
+            `steps.diffuse.outputs.summary`
+            ```
+            ${{ steps.diffuse.outputs.summary }}
+            ```
+
+            `steps.diffuse.outputs.manifest`
+            ```
+            ${{ steps.diffuse.outputs.manifest }}
+            ```
+
+            `steps.diffuse.outputs.dex`
+            ```
+            ${{ steps.diffuse.outputs.dex }}
+            ```
           edit-mode: replace
           comment-id: ${{ steps.find_comment.outputs.comment-id }}
           issue-number: ${{ github.event.pull_request.number }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: actions/upload-artifact@v2
         with:
-          name: diffuse-output
+          name: diffuse-output-2
           path: ${{ steps.diffuse.outputs.diff-file }}

.gitignore

@@ -1,2 +1,4 @@
 /.idea
 /.vscode
+dupa.py
+diffuse-output.txt

action.yml

@@ -31,6 +31,9 @@ outputs:
   diff-gh-comment:
     description: "Diffuse full output as Github comment"
     value: ${{ steps.run-diffuse.outputs.diff-gh-comment }}
+  diff-gh-comment-no-dex:
+    description: "Diffuse full output as Github comment, without dex section, workaround forhttps://github.com/JakeWharton/diffuse/issues/96"
+    value: ${{ steps.run-diffuse.outputs.diff-gh-comment-no-dex }}
   summary:
     description: "Diffuse summary"
     value: ${{ steps.run-diffuse.outputs.summary }}

entrypoint.py

@@ -36,10 +36,12 @@ def header(_content: str):
 \\`\\`\\`
 """
 
+
 def grouper(iterable, n, fillvalue=None):
     args = [iter(iterable)] * n
     return zip_longest(*args, fillvalue=fillvalue)
 
+
 url = "https://github.com/JakeWharton/diffuse/releases/download/{0}/diffuse-{0}-binary.jar" \
     .format(os.getenv("INPUT_VERSION"))
 downloadArgs = ""
@@ -91,16 +93,23 @@ def grouper(iterable, n, fillvalue=None):
     print(f"Found {len(sections)} sections")
 
 github_comment = ""
+github_comment_no_dex = ""
+github_output_limit = 4500
 
 for (title, content) in grouper(sections, 2):
     key = title.lower().strip().replace(" ", "-")
     value = content.strip().replace("$", "_")
+    if len(value) > github_output_limit:
+        value = value[0:github_output_limit] + "\n...✂"
 
-    os.system("echo \"::set-output name={}::{}\"".format(title, github_output(value)))
+    os.system("echo \"::set-output name={}::{}\"".format(key, github_output(value)))
     if key == "summary":
         github_comment += header(value)
+        github_comment_no_dex += header(value)
     else:
-        github_comment += section(key, value)
+        github_comment += section(title.strip(), value)
+        if key != "dex":
+            github_comment_no_dex += section(title.strip(), value)
 
 output = open("diffuse-output.txt", "w")
 output.write(diff)
@@ -109,5 +118,6 @@ def grouper(iterable, n, fillvalue=None):
 if is_debug():
     print(f"Full output stored in: {outputPath}")
 os.system(f"echo \"::set-output name=diff-file::{outputPath}\"")
-os.system(f"echo \"::set-output name=diff-raw::{github_output(diff)}\"")
+os.system(f"echo \"::set-output name=diff-raw::{github_output(diff[0:github_output_limit])}\"")
 os.system(f"echo \"::set-output name=diff-gh-comment::{github_output(github_comment)}\"")
+os.system(f"echo \"::set-output name=diff-gh-comment-no-dex::{github_output(github_comment_no_dex)}\"")