mirror of
https://github.com/JamesIves/github-pages-deploy-action.git
synced 2023-12-15 20:03:39 +08:00
Allow single-commit to work cross repo (#979)
* Adjustments * Formatting
This commit is contained in:
parent
6c7f261809
commit
7a45d6e75c
@ -2,6 +2,7 @@
|
|||||||
process.env['INPUT_FOLDER'] = 'build'
|
process.env['INPUT_FOLDER'] = 'build'
|
||||||
process.env['GITHUB_SHA'] = '123'
|
process.env['GITHUB_SHA'] = '123'
|
||||||
process.env['INPUT_DEBUG'] = 'debug'
|
process.env['INPUT_DEBUG'] = 'debug'
|
||||||
|
process.env['GITHUB_REF_NAME'] = 'test'
|
||||||
|
|
||||||
import '../src/main'
|
import '../src/main'
|
||||||
import {action, TestFlag} from '../src/constants'
|
import {action, TestFlag} from '../src/constants'
|
||||||
|
10
src/lib.ts
10
src/lib.ts
@ -23,12 +23,12 @@ export default async function run(
|
|||||||
info(`
|
info(`
|
||||||
GitHub Pages Deploy Action 🚀
|
GitHub Pages Deploy Action 🚀
|
||||||
|
|
||||||
🚀 Getting Started Guide: https://github.com/marketplace/actions/deploy-to-github-pages
|
💖 Support: https://github.com/sponsors/JamesIves
|
||||||
❓ Discussions / Q&A: https://github.com/JamesIves/github-pages-deploy-action/discussions
|
|
||||||
🔧 Report a Bug: https://github.com/JamesIves/github-pages-deploy-action/issues
|
|
||||||
|
|
||||||
📣 Maintained by James Ives: https://jamesiv.es
|
📣 Maintained by James Ives: https://jamesiv.es
|
||||||
💖 Support: https://github.com/sponsors/JamesIves`)
|
|
||||||
|
🚀 Getting Started Guide: https://github.com/JamesIves/github-pages-deploy-action
|
||||||
|
❓ Discussions / Q&A: https://github.com/JamesIves/github-pages-deploy-action/discussions
|
||||||
|
🔧 Report a Bug: https://github.com/JamesIves/github-pages-deploy-action/issues`)
|
||||||
|
|
||||||
info('Checking configuration and starting deployment… 🚦')
|
info('Checking configuration and starting deployment… 🚦')
|
||||||
|
|
||||||
|
@ -43,28 +43,39 @@ export async function generateWorktree(
|
|||||||
action.workspace,
|
action.workspace,
|
||||||
action.silent
|
action.silent
|
||||||
)
|
)
|
||||||
|
|
||||||
const checkout = new GitCheckout(action.branch)
|
const checkout = new GitCheckout(action.branch)
|
||||||
|
|
||||||
if (branchExists) {
|
if (branchExists) {
|
||||||
// There's existing data on the branch to check out
|
// There's existing data on the branch to check out
|
||||||
checkout.commitish = `origin/${action.branch}`
|
checkout.commitish = `origin/${action.branch}`
|
||||||
}
|
}
|
||||||
if (!branchExists || action.singleCommit) {
|
|
||||||
// Create a new history if we don't have the branch, or if we want to reset it
|
if (
|
||||||
|
!branchExists ||
|
||||||
|
(action.singleCommit && action.branch !== process.env.GITHUB_REF_NAME)
|
||||||
|
) {
|
||||||
|
/* Create a new history if we don't have the branch, or if we want to reset it.
|
||||||
|
If the ref name is the same as the branch name, do not attempt to create an orphan of it. */
|
||||||
checkout.orphan = true
|
checkout.orphan = true
|
||||||
}
|
}
|
||||||
|
|
||||||
await execute(
|
await execute(
|
||||||
checkout.toString(),
|
checkout.toString(),
|
||||||
`${action.workspace}/${worktreedir}`,
|
`${action.workspace}/${worktreedir}`,
|
||||||
action.silent
|
action.silent
|
||||||
)
|
)
|
||||||
|
|
||||||
if (!branchExists) {
|
if (!branchExists) {
|
||||||
info(`Created the ${action.branch} branch… 🔧`)
|
info(`Created the ${action.branch} branch… 🔧`)
|
||||||
|
|
||||||
// Our index is in HEAD state, reset
|
// Our index is in HEAD state, reset
|
||||||
await execute(
|
await execute(
|
||||||
'git reset --hard',
|
'git reset --hard',
|
||||||
`${action.workspace}/${worktreedir}`,
|
`${action.workspace}/${worktreedir}`,
|
||||||
action.silent
|
action.silent
|
||||||
)
|
)
|
||||||
|
|
||||||
if (!action.singleCommit) {
|
if (!action.singleCommit) {
|
||||||
// New history isn't singleCommit, create empty initial commit
|
// New history isn't singleCommit, create empty initial commit
|
||||||
await execute(
|
await execute(
|
||||||
|
Loading…
Reference in New Issue
Block a user