fix: skip logic

peaceiris · Mar 14, 2020 · 01976c9 · 01976c9
1 parent 78a39ce
commit 01976c9
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -73,14 +73,17 @@ export async function skipOnFork(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (context.payload as any).repository.fork === 'true';
 
-  if (isForkRepository && deployKey === '') {
-    core.warning('Action runs on fork and deploy_key is empty');
-    return true;
-  }
+  if (isForkRepository) {
+    if (githubToken) {
+      return false;
+    }
 
-  if (isForkRepository && personalToken === '') {
-    core.warning('Action runs on fork and personalToken is empty');
-    return true;
+    if (!deployKey && !personalToken) {
+      core.warning(
+        'Action runs on fork and deploy_key or personal_token is empty'
+      );
+      return true;
+    }
   }
 
   return false;