From 000c11b89aa8b40b58342c1f4819b9492daf5132 Mon Sep 17 00:00:00 2001
From: Abhijit Valluri <avalluri2@bloomberg.net>
Date: Sat, 3 Oct 2020 01:03:46 +0100
Subject: [PATCH] [skip ci] fix issues with CI

---
 .github/workflows/android-build-pr.yml | 12 +-----------
 .github/workflows/comment-on-pr.yml    | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/comment-on-pr.yml

diff --git a/.github/workflows/android-build-pr.yml b/.github/workflows/android-build-pr.yml
index ce4878cc6..70e0925dc 100644
--- a/.github/workflows/android-build-pr.yml
+++ b/.github/workflows/android-build-pr.yml
@@ -1,6 +1,6 @@
 name: Android build PR
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - fork
 jobs:
@@ -53,17 +53,7 @@ jobs:
         with:
           name: app-x86_64-forkRelease.apk
           path: app/build/outputs/apk/forkRelease/app-x86_64-forkRelease.apk
-      - name: Comment on PR with link to checks page
-        uses: mshick/add-pr-comment@v1
-        with:
-          message: |
-            ### Download the built apks
-            You can download the apks built by Github actions after the CI checks pass.
-            Please go to the <a href="${{ github.event.pull_request.html_url }}/checks">checks page for this PR</a> to find the zipped apk files under the artifacts drop-down, as seen in the example screenshot below.
 
-            <img src="https://raw.githubusercontent.com/fork-maintainers/iceraven-browser/fork/.github/imgs/download-artifacts-screenshot.png" />
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          allow-repeats: false
 
   run-testDebug:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/comment-on-pr.yml b/.github/workflows/comment-on-pr.yml
new file mode 100644
index 000000000..16aeb8e31
--- /dev/null
+++ b/.github/workflows/comment-on-pr.yml
@@ -0,0 +1,24 @@
+name: PR comment
+on:
+  pull_request_target:
+    types: [opened]
+    branches:
+      - fork
+jobs:
+  comment-on-pr:
+    runs-on: ubuntu-latest
+    if: "! contains(toJSON(github.event.pull_request.title), '[skip ci]')"
+    steps:
+      - name: Comment on PR with link to checks page
+        uses: mshick/add-pr-comment@v1
+        with:
+          message: |
+            ### Download the built apks
+            You can download the apks built by Github actions **after** the CI checks pass.
+            Please go to the <a href="${{ github.event.pull_request.html_url }}/checks">checks page for this PR</a> to find the zipped apk files under the artifacts drop-down, as seen in the example screenshot below.
+
+            Note that you will have to click on the "Android build PR" tab on the left side to see the artifacts.
+
+            <img src="https://raw.githubusercontent.com/fork-maintainers/iceraven-browser/fork/.github/imgs/download-artifacts-screenshot.png" />
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          allow-repeats: false