Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge updates from main, if there are any #19

Merged
merged 3 commits into from
Dec 7, 2021
Merged

merge updates from main, if there are any #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00aa864
sync master and dev, if there are changes
staffbase-robert Dec 2, 2021
a2adbc9
reword the message and use the correct branch names
staffbase-robert Dec 3, 2021
3044c32
reset before pushing
staffbase-robert Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions dist/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 16 additions & 10 deletions src/autodev.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ const autoDev = async (): Promise<void> => {
const optimistic = getInput('optimistic') === 'true'
const comments = getInput('comments') === 'false'
const base = getInput('base') || 'master'
const comment = async (successfulPulls: Pull[]): Promise<void> =>
comments
? createComments(token, owner, repo, pulls, successfulPulls)
: Promise.resolve()

const allPulls = await fetchPulls(token, owner, repo)
const pulls = allPulls
Expand All @@ -27,21 +31,23 @@ const autoDev = async (): Promise<void> => {
branch: pull.head.ref
}))

if (pulls.length === 0) {
info('🎉 No Pull Requests found. Nothing to merge.')
return
}

await exec('git fetch')
await exec(`git config --global user.email "${email}"`)
await exec(`git config --global user.name "${user}"`)
await exec('git fetch')
await exec('git checkout dev')
await exec(`git reset --hard origin/${base}`)

const comment = async (successfulPulls: Pull[]): Promise<void> =>
comments
? createComments(token, owner, repo, pulls, successfulPulls)
: Promise.resolve()
if (pulls.length === 0) {
if (await hasDiff('HEAD', `origin/${branch}`)) {
await exec('git push -f')
info(
`🎉 No Pull Requests found. Pushed changes, because "${branch}" and "${base}" diverged.`
)
} else {
info('🎉 No Pull Requests found. Nothing to merge.')
}
return
}

const message = optimistic
? await merge(base, pulls, comment)
Expand Down