diff --git a/__tests__/utils.test.ts b/__tests__/utils.test.ts index d893b122b..31eaefc0a 100644 --- a/__tests__/utils.test.ts +++ b/__tests__/utils.test.ts @@ -70,28 +70,14 @@ async function getWorkDir(): Promise { } describe('addNoJekyll()', () => { - test('add .nojekyll gh-pages', async () => { + test('add .nojekyll', async () => { let workDir = ''; (async (): Promise => { workDir = await getWorkDir(); })(); const filepath = path.join(workDir, '.nojekyll'); - await addNoJekyll(workDir, false, 'gh-pages'); - const test = fs.existsSync(filepath); - expect(test).toBe(true); - - fs.unlinkSync(filepath); - }); - - test('add .nojekyll master', async () => { - let workDir = ''; - (async (): Promise => { - workDir = await getWorkDir(); - })(); - const filepath = path.join(workDir, '.nojekyll'); - - await addNoJekyll(workDir, false, 'master'); + await addNoJekyll(workDir, false); const test = fs.existsSync(filepath); expect(test).toBe(true); @@ -106,57 +92,21 @@ describe('addNoJekyll()', () => { const filepath = path.join(workDir, '.nojekyll'); fs.closeSync(fs.openSync(filepath, 'w')); - await addNoJekyll(workDir, false, 'master'); + await addNoJekyll(workDir, false); const test = fs.existsSync(filepath); expect(test).toBe(true); fs.unlinkSync(filepath); }); - test('not add .nojekyll disable_nojekyll gh-pages', async () => { - let workDir = ''; - (async (): Promise => { - workDir = await getWorkDir(); - })(); - const filepath = path.join(workDir, '.nojekyll'); - - await addNoJekyll(workDir, true, 'gh-pages'); - const test = fs.existsSync(filepath); - expect(test).toBe(false); - }); - - test('not add .nojekyll disable_nojekyll master', async () => { - let workDir = ''; - (async (): Promise => { - workDir = await getWorkDir(); - })(); - const filepath = path.join(workDir, '.nojekyll'); - - await addNoJekyll(workDir, true, 'master'); - const test = fs.existsSync(filepath); - expect(test).toBe(false); - }); - - test('not add .nojekyll other-branch', async () => { - let workDir = ''; - (async (): Promise => { - workDir = await getWorkDir(); - })(); - const filepath = path.join(workDir, '.nojekyll'); - - await addNoJekyll(workDir, false, 'other-branch'); - const test = fs.existsSync(filepath); - expect(test).toBe(false); - }); - - test('not add .nojekyll disable_nojekyll other-branch', async () => { + test('not add .nojekyll disable_nojekyll', async () => { let workDir = ''; (async (): Promise => { workDir = await getWorkDir(); })(); const filepath = path.join(workDir, '.nojekyll'); - await addNoJekyll(workDir, true, 'other-branch'); + await addNoJekyll(workDir, true); const test = fs.existsSync(filepath); expect(test).toBe(false); }); diff --git a/src/main.ts b/src/main.ts index 2688531b7..14d8cfe4c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -48,7 +48,7 @@ export async function run(): Promise { const unixTime = date.getTime(); const workDir = await getWorkDirName(`${unixTime}`); await setRepo(inps, remoteURL, workDir); - await addNoJekyll(workDir, inps.DisableNoJekyll, inps.PublishBranch); + await addNoJekyll(workDir, inps.DisableNoJekyll); await addCNAME(workDir, inps.CNAME); core.endGroup(); diff --git a/src/utils.ts b/src/utils.ts index a18e1ecfe..eaf457e51 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -29,22 +29,16 @@ export async function createDir(dirPath: string): Promise { return; } -export async function addNoJekyll( - workDir: string, - DisableNoJekyll: boolean, - PublishBranch: string -): Promise { +export async function addNoJekyll(workDir: string, DisableNoJekyll: boolean): Promise { if (DisableNoJekyll) { return; } - if (PublishBranch === 'master' || PublishBranch === 'gh-pages') { - const filepath = path.join(workDir, '.nojekyll'); - if (fs.existsSync(filepath)) { - return; - } - fs.closeSync(fs.openSync(filepath, 'w')); - core.info(`[INFO] Created ${filepath}`); + const filepath = path.join(workDir, '.nojekyll'); + if (fs.existsSync(filepath)) { + return; } + fs.closeSync(fs.openSync(filepath, 'w')); + core.info(`[INFO] Created ${filepath}`); } export async function addCNAME(workDir: string, content: string): Promise {