chore(release): 3.5.4-3

Close #153

CHANGELOG.md

@@ -2,55 +2,6 @@
 
 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.5](https://github.com/peaceiris/actions-gh-pages/compare/v3.5.4...v3.5.5) (2020-03-16)
-
-
-### chore
-
-* Add new task all ([01fdaf2](https://github.com/peaceiris/actions-gh-pages/commit/01fdaf2f0274401d2403c809b20c37fb7a8535a6))
-
-### fix
-
-* skip on fork if pull_request (#158) ([d6bd618](https://github.com/peaceiris/actions-gh-pages/commit/d6bd6182f264ce695613180743d42e377570bbf4)), closes [#158](https://github.com/peaceiris/actions-gh-pages/issues/158) [#157](https://github.com/peaceiris/actions-gh-pages/issues/157)
-
-
-
-## [3.5.4](https://github.com/peaceiris/actions-gh-pages/compare/v3.5.3...v3.5.4) (2020-03-16)
-
-
-### fix
-
-* skip deployment on forks (#156) ([4f06df8](https://github.com/peaceiris/actions-gh-pages/commit/4f06df820b7a5882e2faef0e6929bb670140fba0)), closes [#156](https://github.com/peaceiris/actions-gh-pages/issues/156) [#153](https://github.com/peaceiris/actions-gh-pages/issues/153)
-
-
-
-## [3.5.4-6](https://github.com/peaceiris/actions-gh-pages/compare/v3.5.4-5...v3.5.4-6) (2020-03-15)
-
-
-### fix
-
-* skip logic ([44bdada](https://github.com/peaceiris/actions-gh-pages/commit/44bdada02c71f646d23ffefe1ea07d16386dbf83))
-
-
-
-## [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)
 
 

Makefile

@@ -21,7 +21,3 @@ test:
 .PHONY: commit
 commit:
 	$(DOCKER_RUN) git commit -m "$(msg)"
-
-.PHONY: all
-all:
-	$(DOCKER_RUN) npm run all

__tests__/utils.test.ts

@@ -5,8 +5,7 @@ import {
   getWorkDirName,
   createWorkDir,
   addNoJekyll,
-  addCNAME,
-  skipOnFork
+  addCNAME
 } from '../src/utils';
 
 beforeEach(() => {
@@ -204,30 +203,3 @@ 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 no tokens', async () => {
-    const test = await skipOnFork(true, '', '', '');
-    expect(test).toBeTruthy();
-  });
-});

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "actions-github-pages",
-  "version": "3.5.5",
+  "version": "3.5.4-3",
   "description": "GitHub Actions for GitHub Pages",
   "main": "lib/index.js",
   "engines": {
@@ -8,7 +8,6 @@
     "npm": ">=6.14.2"
   },
   "scripts": {
-    "all": "npm run format && npm run lint && npm test",
     "lint": "eslint ./{src,__tests__}/**/*.ts",
     "lint:fix": "eslint --fix ./{src,__tests__}/**/*.ts",
     "test": "jest --coverage --verbose --detectOpenHandles",

src/main.ts

@@ -1,4 +1,3 @@
-import {context} from '@actions/github';
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 import {Inputs} from './interfaces';
@@ -12,22 +11,13 @@ export async function run(): Promise<void> {
     const inps: Inputs = getInputs();
     showInputs(inps);
 
-    const eventName = context.eventName;
-    if (eventName === 'pull_request') {
-      // 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(
-          'This action runs on a fork and not found auth token, Skip deployment'
-        );
-        return;
-      }
+    const isSkipOnFork = await skipOnFork(
+      inps.GithubToken,
+      inps.DeployKey,
+      inps.PersonalToken
+    );
+    if (isSkipOnFork) {
+      return;
     }
 
     const remoteURL = await setTokens(inps);

src/utils.ts

@@ -1,3 +1,4 @@
+import {context} from '@actions/github';
 import * as core from '@actions/core';
 import * as io from '@actions/io';
 import path from 'path';
@@ -64,13 +65,23 @@ 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 === '' && deployKey === '' && personalToken === '') {
+    if (githubToken) {
+      return false;
+    }
+
+    if (!deployKey && !personalToken) {
+      core.warning(
+        'Action runs on fork and deploy_key or personal_token is empty'
+      );
       return true;
     }
   }