chore(release): 3.3.0-0

- Add .nojekyll file by default for only the master and gh-pages branches. When the file already exists, this action does nothing.
- When we set other branches to publish_dir, this action does not add .nojekyll file.

cf. #112

Co-authored-by: Daniel Himmelstein <daniel.himmelstein@gmail.com>
Co-authored-by: Nicolas Vanhoren <nicolas.vanhoren@gmail.com>

.github/workflows/test.yml

@@ -62,7 +62,3 @@ jobs:
         with:
           name: coverage
           path: coverage
-
-      - uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}

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.3.0](https://github.com/peaceiris/actions-gh-pages/compare/v3.2.0...v3.3.0) (2020-02-24)
-
-
-### deps
-
-* bump @actions/github from 2.1.0 to 2.1.1 (#120) ([5d3cd50](https://github.com/peaceiris/actions-gh-pages/commit/5d3cd509d9e8ab8ba8b6c6981eb8ecb077ab2109)), closes [#120](https://github.com/peaceiris/actions-gh-pages/issues/120)
-* bump @types/jest from 25.1.2 to 25.1.3 (#118) ([0b1dd44](https://github.com/peaceiris/actions-gh-pages/commit/0b1dd44709acc2ba27cf43e181767b92e78d1577)), closes [#118](https://github.com/peaceiris/actions-gh-pages/issues/118)
-* bump @types/node from 12.12.27 to 12.12.28 (#122) ([b243caf](https://github.com/peaceiris/actions-gh-pages/commit/b243cafb6e6598d71925399552d569a628a42aa7)), closes [#122](https://github.com/peaceiris/actions-gh-pages/issues/122)
-* bump @zeit/ncc from 0.21.0 to 0.21.1 (#101) ([6244b19](https://github.com/peaceiris/actions-gh-pages/commit/6244b197b6c5a57172d87769cd03d79cedae9dca)), closes [#101](https://github.com/peaceiris/actions-gh-pages/issues/101)
-* bump ts-jest from 25.2.0 to 25.2.1 (#117) ([e1bf32a](https://github.com/peaceiris/actions-gh-pages/commit/e1bf32ad68fadb9a32147579d6dc49b51d6ddefb)), closes [#117](https://github.com/peaceiris/actions-gh-pages/issues/117)
-* bump typescript from 3.7.5 to 3.8.2 (#121) ([e58a6c1](https://github.com/peaceiris/actions-gh-pages/commit/e58a6c156e7249d4e6052539e2ed0aa449bdd4f4)), closes [#121](https://github.com/peaceiris/actions-gh-pages/issues/121)
-
-### feat
-
-* Add disable_nojekyll and cname options (#119) ([00fde1e](https://github.com/peaceiris/actions-gh-pages/commit/00fde1eb97e54d4fa89f31806ff2815878fafcb6)), closes [#119](https://github.com/peaceiris/actions-gh-pages/issues/119) [/github.com/peaceiris/actions-gh-pages/issues/112#issuecomment-589678269](https://github.com//github.com/peaceiris/actions-gh-pages/issues/112/issues/issuecomment-589678269) [#112](https://github.com/peaceiris/actions-gh-pages/issues/112)
-
-
-
 # [3.3.0-0](https://github.com/peaceiris/actions-gh-pages/compare/v3.2.0...v3.3.0-0) (2020-02-20)
 
 

README.md

@@ -72,8 +72,6 @@ Three tokens are supported.
 - [Options](#options)
   - [⭐️ `personal_token`](#%EF%B8%8F-personal_token)
   - [⭐️ `github_token`](#%EF%B8%8F-github_token)
-  - [⭐️ CNAME](#%EF%B8%8F-cname)
-  - [⭐️ Disable `.nojekyll`](#%EF%B8%8F-disable-nojekyll)
   - [⭐️ Allow empty commits](#%EF%B8%8F-allow-empty-commits)
   - [⭐️ Keeping existing files](#%EF%B8%8F-keeping-existing-files)
   - [⭐️ Deploy to external repository](#%EF%B8%8F-deploy-to-external-repository)
@@ -248,36 +246,6 @@ jobs:
 + github_token: ${{ secrets.GITHUB_TOKEN }}
 ```
 
-### ⭐️ CNAME
-
-To add `CNAME` file, we can set the `cname` option.
-
-For more details about `CNAME`, read the official documentation: [Managing a custom domain for your GitHub Pages site - GitHub Help](https://help.github.com/en/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site)
-
-```yaml
-- name: Deploy
-  uses: peaceiris/actions-gh-pages@v3
-  with:
-    deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-    publish_dir: ./public
-    cname: github.com
-```
-
-### ⭐️ Disable `.nojekyll`
-
-By default, this action adds the `.nojekyll` file to only the `master` and `gh-pages` branches. When the file already exists, this action does nothing.
-
-To disable this behavior, we can set the `disable_nojekyll` option to `true`.
-
-```yaml
-- name: Deploy
-  uses: peaceiris/actions-gh-pages@v3
-  with:
-    deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-    publish_dir: ./public
-    disable_nojekyll: true
-```
-
 ### ⭐️ Allow empty commits
 
 By default, a commit will not be generated when no file changes. If you want to allow an empty commit, set the optional parameter `allow_empty_commit` to `true`.

__tests__/utils.test.ts

@@ -16,12 +16,6 @@ beforeEach(() => {
 
 // });
 
-async function getTime(): Promise<string> {
-  const date = new Date();
-  const unixTime = date.getTime();
-  return `${unixTime}`;
-}
-
 describe('getHomeDir()', () => {
   test('get home directory name', async () => {
     let test = '';
@@ -30,38 +24,14 @@ describe('getHomeDir()', () => {
     } else {
       test = `${process.env.HOME}`;
     }
-    const expected = await getHomeDir();
-    expect(test).toMatch(expected);
-  });
-});
-
-describe('getWorkDirName()', () => {
-  test('get work directory name', async () => {
-    let home = '';
-    if (process.platform === 'win32') {
-      home = 'C:\\Users\\runneradmin';
-    } else {
-      home = `${process.env.HOME}`;
-    }
-    const unixTime = await getTime();
-    const expected = path.join(home, `actions_github_pages_${unixTime}`);
-    const test = await getWorkDirName(`${unixTime}`);
-    expect(test).toMatch(expected);
-  });
-});
-
-describe('createWorkDir()', () => {
-  test('create work directory', async () => {
-    const unixTime = await getTime();
-    const workDirName = await getWorkDirName(`${unixTime}`);
-    await createWorkDir(workDirName);
-    const test = fs.existsSync(workDirName);
-    expect(test).toBe(true);
+    const homeDir = await getHomeDir();
+    expect(homeDir).toMatch(test);
   });
 });
 
 async function getWorkDir(): Promise<string> {
-  const unixTime = await getTime();
+  const date = new Date();
+  const unixTime = date.getTime();
   let workDir = '';
   workDir = await getWorkDirName(`${unixTime}`);
   await createWorkDir(workDir);

lib/index.js

@@ -2746,7 +2746,7 @@ function addCNAME(workDir, content) {
         }
         const filepath = path_1.default.join(workDir, 'CNAME');
         if (fs_1.default.existsSync(filepath)) {
-            core.warning(`CNAME already exists, skip adding CNAME`);
+            core.warning(`CNAME already exists`);
             return;
         }
         fs_1.default.writeFileSync(filepath, content + '\n');
@@ -7954,6 +7954,9 @@ exports.RequestError = RequestError;
 
 "use strict";
 
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -7964,13 +7967,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 // Originally pulled from https://github.com/JasonEtco/actions-toolkit/blob/master/src/github.ts
 const graphql_1 = __webpack_require__(898);
-const rest_1 = __webpack_require__(0);
+const rest_1 = __importDefault(__webpack_require__(0));
 const Context = __importStar(__webpack_require__(262));
 const httpClient = __importStar(__webpack_require__(539));
 // We need this in order to extend Octokit
-rest_1.Octokit.prototype = new rest_1.Octokit();
+rest_1.default.prototype = new rest_1.default();
 exports.context = new Context.Context();
-class GitHub extends rest_1.Octokit {
+class GitHub extends rest_1.default {
     constructor(token, opts) {
         super(GitHub.getOctokitOptions(GitHub.disambiguate(token, opts)));
         this.graphql = GitHub.getGraphQL(GitHub.disambiguate(token, opts));

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "actions-github-pages",
-  "version": "3.3.0",
+  "version": "3.3.0-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -18,13 +18,13 @@
       }
     },
     "@actions/github": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-2.1.1.tgz",
-      "integrity": "sha512-kAgTGUx7yf5KQCndVeHSwCNZuDBvPyxm5xKTswW2lofugeuC1AZX73nUUVDNaysnM9aKFMHv9YCdVJbg7syEyA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-2.1.0.tgz",
+      "integrity": "sha512-G4ncMlh4pLLAvNgHUYUtpWQ1zPf/VYqmRH9oshxLabdaOOnp7i1hgSgzr2xne2YUaSND3uqemd3YYTIsm2f/KQ==",
       "requires": {
         "@actions/http-client": "^1.0.3",
         "@octokit/graphql": "^4.3.1",
-        "@octokit/rest": "^16.43.1"
+        "@octokit/rest": "^16.15.0"
       }
     },
     "@actions/http-client": {
@@ -756,9 +756,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "12.12.28",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.28.tgz",
-      "integrity": "sha512-g73GJYJDXgf0jqg+P9S8h2acWbDXNkoCX8DLtJVu7Fkn788pzQ/oJsrdJz/2JejRf/SjfZaAhsw+3nd1D5EWGg=="
+      "version": "12.12.27",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.27.tgz",
+      "integrity": "sha512-odQFl/+B9idbdS0e8IxDl2ia/LP8KZLXhV3BUeI98TrZp0uoIzQPhGd+5EtzHmT0SMOIaPd7jfz6pOHLWTtl7A=="
     },
     "@types/parse-json": {
       "version": "4.0.0",
@@ -915,9 +915,9 @@
       }
     },
     "@zeit/ncc": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.21.1.tgz",
-      "integrity": "sha512-M9WzgquSOt2nsjRkYM9LRylBLmmlwNCwYbm3Up3PDEshfvdmIfqpFNSK8EJvR18NwZjGHE5z2avlDtYQx2JQnw==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.21.0.tgz",
+      "integrity": "sha512-RUMdvVK/w78oo+yBjruZltt0kJXYar2un/1bYQ2LuHG7GmFVm+QjxzEmySwREctaJdEnBvlMdUNWd9hXHxEI3g==",
       "dev": true
     },
     "JSONStream": {
@@ -7507,9 +7507,9 @@
       }
     },
     "typescript": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz",
-      "integrity": "sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==",
+      "version": "3.7.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
+      "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
       "dev": true
     },
     "uglify-js": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "actions-github-pages",
-  "version": "3.3.0",
+  "version": "3.3.0-0",
   "description": "GitHub Actions for GitHub Pages",
   "main": "lib/index.js",
   "engines": {
@@ -52,7 +52,7 @@
   "dependencies": {
     "@actions/core": "^1.2.2",
     "@actions/exec": "^1.0.3",
-    "@actions/github": "^2.1.1",
+    "@actions/github": "^2.1.0",
     "@actions/io": "^1.0.2"
   },
   "devDependencies": {
@@ -60,7 +60,7 @@
     "@types/node": "~12",
     "@typescript-eslint/eslint-plugin": "^2.20.0",
     "@typescript-eslint/parser": "^2.20.0",
-    "@zeit/ncc": "^0.21.1",
+    "@zeit/ncc": "^0.21.0",
     "eslint": "^6.8.0",
     "eslint-plugin-jest": "^23.7.0",
     "husky": "^4.2.3",
@@ -70,6 +70,6 @@
     "prettier": "1.19.1",
     "standard-version": "^7.1.0",
     "ts-jest": "^25.2.1",
-    "typescript": "^3.8.2"
+    "typescript": "^3.7.5"
   }
 }

src/utils.ts

@@ -56,7 +56,7 @@ export async function addCNAME(
   }
   const filepath = path.join(workDir, 'CNAME');
   if (fs.existsSync(filepath)) {
-    core.warning(`CNAME already exists, skip adding CNAME`);
+    core.warning(`CNAME already exists`);
     return;
   }
   fs.writeFileSync(filepath, content + '\n');