chore(release): 3.5.4-5

CHANGELOG.md

@@ -2,6 +2,33 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.5.4-5](https://github.com/peaceiris/actions-gh-pages/compare/v3.5.4-4...v3.5.4-5) (2020-03-14)
+
+
+### fix
+
+* property access ([72f58a0](https://github.com/peaceiris/actions-gh-pages/commit/72f58a06cf5db88d3eb982f57de8dbc266e39232))
+
+
+
+## [3.5.4-4](https://github.com/peaceiris/actions-gh-pages/compare/v3.5.4-3...v3.5.4-4) (2020-03-14)
+
+
+### test
+
+* skipOnFork() ([6f9a5b7](https://github.com/peaceiris/actions-gh-pages/commit/6f9a5b7a66bbf855cadc34099fa6450c40eff4a2))
+
+
+
+## [3.5.4-3](https://github.com/peaceiris/actions-gh-pages/compare/v3.5.4-2...v3.5.4-3) (2020-03-14)
+
+
+### fix
+
+* skip logic ([01976c9](https://github.com/peaceiris/actions-gh-pages/commit/01976c9d9b95b42997caa2a85c2d737eb75e852e))
+
+
+
 ## [3.5.4-2](https://github.com/peaceiris/actions-gh-pages/compare/v3.5.4-1...v3.5.4-2) (2020-03-14)
 
 

__tests__/utils.test.ts

@@ -5,7 +5,8 @@ import {
   getWorkDirName,
   createWorkDir,
   addNoJekyll,
-  addCNAME
+  addCNAME,
+  skipOnFork
 } from '../src/utils';
 
 beforeEach(() => {
@@ -203,3 +204,30 @@ describe('addCNAME()', () => {
     fs.unlinkSync(filepath);
   });
 });
+
+describe('skipOnFork()', () => {
+  test('return false on upstream', async () => {
+    const test = await skipOnFork(false, 'token', '', '');
+    expect(test).toBeFalsy();
+  });
+
+  test('return false on fork with github_token', async () => {
+    const test = await skipOnFork(true, 'token', '', '');
+    expect(test).toBeFalsy();
+  });
+
+  test('return false on fork with deploy_key', async () => {
+    const test = await skipOnFork(true, '', 'deploy_key', '');
+    expect(test).toBeFalsy();
+  });
+
+  test('return false on fork with personal_token', async () => {
+    const test = await skipOnFork(true, '', '', 'personal_token');
+    expect(test).toBeFalsy();
+  });
+
+  test('return true on fork with empty deploy_key or personal_token', async () => {
+    const test = await skipOnFork(true, '', '', '');
+    expect(test).toBeTruthy();
+  });
+});

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "actions-github-pages",
-  "version": "3.5.4-2",
+  "version": "3.5.4-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "actions-github-pages",
-  "version": "3.5.4-2",
+  "version": "3.5.4-5",
   "description": "GitHub Actions for GitHub Pages",
   "main": "lib/index.js",
   "engines": {

src/main.ts

@@ -1,3 +1,4 @@
+import {context} from '@actions/github';
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 import {Inputs} from './interfaces';
@@ -11,12 +12,18 @@ export async function run(): Promise<void> {
     const inps: Inputs = getInputs();
     showInputs(inps);
 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const isForkRepository = (context.payload as any).repository.fork;
     const isSkipOnFork = await skipOnFork(
+      isForkRepository,
       inps.GithubToken,
       inps.DeployKey,
       inps.PersonalToken
     );
     if (isSkipOnFork) {
+      core.warning(
+        'Action runs on fork and deploy_key or personal_token is empty, Skip deployment'
+      );
       return;
     }
 

src/utils.ts

@@ -1,4 +1,3 @@
-import {context} from '@actions/github';
 import * as core from '@actions/core';
 import * as io from '@actions/io';
 import path from 'path';
@@ -65,22 +64,19 @@ export async function addCNAME(
 }
 
 export async function skipOnFork(
+  isForkRepository: boolean,
   githubToken: string,
   deployKey: string,
   personalToken: string
 ): Promise<boolean> {
-  const isForkRepository =
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (context.payload as any).repository.fork === 'true';
+  if (isForkRepository) {
+    if (githubToken) {
+      return false;
+    }
 
-  if (isForkRepository && deployKey === '') {
-    core.warning('Action runs on fork and deploy_key is empty');
-    return true;
-  }
-
-  if (isForkRepository && personalToken === '') {
-    core.warning('Action runs on fork and personalToken is empty');
-    return true;
+    if (deployKey === '' && personalToken === '') {
+      return true;
+    }
   }
 
   return false;