mirror of
https://github.com/JamesIves/github-pages-deploy-action.git
synced 2023-12-15 20:03:39 +08:00
95f8a2cd05
* Return early from dry run Determining whether to create a merge commit would elicit a nested conditional, which could be hard to parse for a human reader. This is avoided by returning early as soon as possible for a dry run. This also resolves the erroneous 'changes committed' message when no changes were actually committed because of the dry run. A message specific to dry-run is logged instead. * Add force parameter to action interface Existing behaviour is equivalent to force=true, so the default value is true. * Implement pull+rebase procedure * Declare force parameter in action * Detect both rejection syntaxes * Return both stdout and stderr from execute * Ignore non-zero exit status on push * Remove unnecessary error catch * Fetch and rebase in separate steps * Explicitly bind incoming branch I think the fetch will update the origin/gh-pages branch but not the gh-pages branch, despite requesting gh-pages. This means that when I later attempt to rebase the temp branch on top of the gh-pages branch, there will be nothing to do, because that's already where it is. * Implement attempt limit I don't expect this to ever require more than one attempt in production, but in theory it's possible that this procedure could loop forever. We would need to keep fetching and rebasing if changes keep being added to the remote. In practice, I believe this would only happen if there are lots of workflows simultaneously deploying to the same branch, all using this action. In this case only one would be able to secure a lock at a time, leading to the total number of attempts being equal to the number of simultaneous deployments, assuming each deployment makes each attempt at the exact same time. The limit may need to be increased or even be configurable, but 3 should cover most uses. * Update tests for execute output split * Document 'force' parameter * Create integration test for rebase procedure This test is composed of 3 jobs. The first two jobs run simultaneously, and as such both depend on the previous integration test only. The final job cleans up afterwards, and depends on both of the prior jobs. The two jobs are identical except that they both create a temporary file in a different location. This is to ensure that they conflict. Correctly resolving this conflict by rebasing one deployment over the other, resulting in a deployment containing both files, indicates a successful test.
200 lines
6.0 KiB
TypeScript
200 lines
6.0 KiB
TypeScript
import {rmRF} from '@actions/io'
|
|
import {TestFlag} from '../src/constants'
|
|
import {generateWorktree} from '../src/worktree'
|
|
import {execute} from '../src/execute'
|
|
import fs from 'fs'
|
|
import os from 'os'
|
|
import path from 'path'
|
|
|
|
jest.mock('@actions/core', () => ({
|
|
setFailed: jest.fn(),
|
|
getInput: jest.fn(),
|
|
isDebug: jest.fn(),
|
|
info: jest.fn()
|
|
}))
|
|
|
|
/*
|
|
Test generateWorktree against a known git repository.
|
|
The upstream repository `origin` is set up once for the test suite,
|
|
and for each test run, a new clone is created.
|
|
|
|
See workstree.error.test.ts for testing mocked errors from git.*/
|
|
|
|
describe('generateWorktree', () => {
|
|
let tempdir: string | null = null
|
|
let clonedir: string | null = null
|
|
beforeAll(async () => {
|
|
// Set up origin repository
|
|
const silent = true
|
|
tempdir = fs.mkdtempSync(path.join(os.tmpdir(), 'gh-deploy-'))
|
|
const origin = path.join(tempdir, 'origin')
|
|
await execute('git init origin', tempdir, silent)
|
|
await execute('git config user.email "you@example.com"', origin, silent)
|
|
await execute('git config user.name "Jane Doe"', origin, silent)
|
|
await execute('git checkout -b main', origin, silent)
|
|
fs.writeFileSync(path.join(origin, 'f1'), 'hello world\n')
|
|
await execute('git add .', origin, silent)
|
|
await execute('git commit -mc0', origin, silent)
|
|
fs.writeFileSync(path.join(origin, 'f1'), 'hello world\nand planets\n')
|
|
await execute('git add .', origin, silent)
|
|
await execute('git commit -mc1', origin, silent)
|
|
await execute('git checkout --orphan gh-pages', origin, silent)
|
|
await execute('git reset --hard', origin, silent)
|
|
await fs.promises.writeFile(path.join(origin, 'gh1'), 'pages content\n')
|
|
await execute('git add .', origin, silent)
|
|
await execute('git commit -mgh0', origin, silent)
|
|
await fs.promises.writeFile(
|
|
path.join(origin, 'gh1'),
|
|
'pages content\ngoes on\n'
|
|
)
|
|
await execute('git add .', origin, silent)
|
|
await execute('git commit -mgh1', origin, silent)
|
|
})
|
|
beforeEach(async () => {
|
|
// Clone origin to our workspace for each test
|
|
const silent = true
|
|
clonedir = path.join(tempdir as string, 'clone')
|
|
await execute('git init clone', tempdir as string, silent)
|
|
await execute('git config user.email "you@example.com"', clonedir, silent)
|
|
await execute('git config user.name "Jane Doe"', clonedir, silent)
|
|
await execute(
|
|
`git remote add origin ${path.join(tempdir as string, 'origin')}`,
|
|
clonedir,
|
|
silent
|
|
)
|
|
await execute('git fetch --depth=1 origin main', clonedir, silent)
|
|
await execute('git checkout main', clonedir, silent)
|
|
})
|
|
afterEach(async () => {
|
|
// Tear down workspace
|
|
await rmRF(clonedir as string)
|
|
})
|
|
afterAll(async () => {
|
|
// Tear down origin repository
|
|
if (tempdir) {
|
|
await rmRF(tempdir)
|
|
// console.log(tempdir)
|
|
}
|
|
})
|
|
describe('with existing branch and new commits', () => {
|
|
it('should check out the latest commit', async () => {
|
|
const workspace = clonedir as string
|
|
await generateWorktree(
|
|
{
|
|
hostname: 'github.com',
|
|
workspace,
|
|
singleCommit: false,
|
|
branch: 'gh-pages',
|
|
folder: '',
|
|
silent: true,
|
|
isTest: TestFlag.NONE
|
|
},
|
|
'worktree',
|
|
true
|
|
)
|
|
const dirEntries = await fs.promises.readdir(
|
|
path.join(workspace, 'worktree')
|
|
)
|
|
expect(dirEntries.sort((a, b) => a.localeCompare(b))).toEqual([
|
|
'.git',
|
|
'gh1'
|
|
])
|
|
const commitMessages = await execute(
|
|
'git log --format=%s',
|
|
path.join(workspace, 'worktree'),
|
|
true
|
|
)
|
|
expect(commitMessages.stdout).toBe('gh1')
|
|
})
|
|
})
|
|
describe('with missing branch and new commits', () => {
|
|
it('should create initial commit', async () => {
|
|
const workspace = clonedir as string
|
|
await generateWorktree(
|
|
{
|
|
hostname: 'github.com',
|
|
workspace,
|
|
singleCommit: false,
|
|
branch: 'no-pages',
|
|
folder: '',
|
|
silent: true,
|
|
isTest: TestFlag.NONE
|
|
},
|
|
'worktree',
|
|
false
|
|
)
|
|
const dirEntries = await fs.promises.readdir(
|
|
path.join(workspace, 'worktree')
|
|
)
|
|
expect(dirEntries).toEqual(['.git'])
|
|
const commitMessages = await execute(
|
|
'git log --format=%s',
|
|
path.join(workspace, 'worktree'),
|
|
true
|
|
)
|
|
expect(commitMessages.stdout).toBe('Initial no-pages commit')
|
|
})
|
|
})
|
|
describe('with existing branch and singleCommit', () => {
|
|
it('should check out the latest commit', async () => {
|
|
const workspace = clonedir as string
|
|
await generateWorktree(
|
|
{
|
|
hostname: 'github.com',
|
|
workspace,
|
|
singleCommit: true,
|
|
branch: 'gh-pages',
|
|
folder: '',
|
|
silent: true,
|
|
isTest: TestFlag.NONE
|
|
},
|
|
'worktree',
|
|
true
|
|
)
|
|
const dirEntries = await fs.promises.readdir(
|
|
path.join(workspace, 'worktree')
|
|
)
|
|
expect(dirEntries.sort((a, b) => a.localeCompare(b))).toEqual([
|
|
'.git',
|
|
'gh1'
|
|
])
|
|
expect(async () => {
|
|
await execute(
|
|
'git log --format=%s',
|
|
path.join(workspace, 'worktree'),
|
|
true
|
|
)
|
|
}).rejects.toThrow()
|
|
})
|
|
})
|
|
describe('with missing branch and singleCommit', () => {
|
|
it('should create initial commit', async () => {
|
|
const workspace = clonedir as string
|
|
await generateWorktree(
|
|
{
|
|
hostname: 'github.com',
|
|
workspace,
|
|
singleCommit: true,
|
|
branch: 'no-pages',
|
|
folder: '',
|
|
silent: true,
|
|
isTest: TestFlag.NONE
|
|
},
|
|
'worktree',
|
|
false
|
|
)
|
|
const dirEntries = await fs.promises.readdir(
|
|
path.join(workspace, 'worktree')
|
|
)
|
|
expect(dirEntries).toEqual(['.git'])
|
|
expect(async () => {
|
|
await execute(
|
|
'git log --format=%s',
|
|
path.join(workspace, 'worktree'),
|
|
true
|
|
)
|
|
}).rejects.toThrow()
|
|
})
|
|
})
|
|
})
|