chore(release): 3.5.4-5

Close #153

CHANGELOG.md

@@ -2,24 +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.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)
 
 

__tests__/utils.test.ts

@@ -226,7 +226,7 @@ describe('skipOnFork()', () => {
     expect(test).toBeFalsy();
   });
 
-  test('return true on fork with no tokens', async () => {
+  test('return true on fork with empty deploy_key or personal_token', async () => {
     const test = await skipOnFork(true, '', '', '');
     expect(test).toBeTruthy();
   });

lib/index.js

@@ -1769,7 +1769,7 @@ function run() {
             const isForkRepository = github_1.context.payload.repository.fork;
             const isSkipOnFork = yield utils_1.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');
+                core.warning('Action runs on fork and deploy_key or personal_token is empty, Skip deployment');
                 return;
             }
             const remoteURL = yield set_tokens_1.setTokens(inps);
@@ -2272,7 +2272,10 @@ exports.addCNAME = addCNAME;
 function skipOnFork(isForkRepository, githubToken, deployKey, personalToken) {
     return __awaiter(this, void 0, void 0, function* () {
         if (isForkRepository) {
-            if (githubToken === '' && deployKey === '' && personalToken === '') {
+            if (githubToken) {
+                return false;
+            }
+            if (deployKey === '' && personalToken === '') {
                 return true;
             }
         }

package-lock.json

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

package.json

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

src/main.ts

@@ -22,7 +22,7 @@ export async function run(): Promise<void> {
     );
     if (isSkipOnFork) {
       core.warning(
-        'This action runs on a fork and not found auth token, Skip deployment'
+        'Action runs on fork and deploy_key or personal_token is empty, Skip deployment'
       );
       return;
     }

src/utils.ts

@@ -70,7 +70,11 @@ export async function skipOnFork(
   personalToken: string
 ): Promise<boolean> {
   if (isForkRepository) {
-    if (githubToken === '' && deployKey === '' && personalToken === '') {
+    if (githubToken) {
+      return false;
+    }
+
+    if (deployKey === '' && personalToken === '') {
       return true;
     }
   }