0
0
Fork 0
mirror of https://github.com/actions/checkout.git synced 2024-11-24 15:16:20 +01:00

fix ref for pr closed event when a pr is merged (#141)

This commit is contained in:
eric sciple 2020-01-21 14:17:04 -05:00 committed by GitHub
parent db41740e12
commit 090d9c9dfd
Failed to generate hash of commit
3 changed files with 25 additions and 0 deletions

View file

@ -75,6 +75,20 @@ describe('input-helper tests', () => {
expect(settings.repositoryPath).toBe(gitHubWorkspace) expect(settings.repositoryPath).toBe(gitHubWorkspace)
}) })
it('qualifies ref', () => {
let originalContext = mockGitHub.context
try {
mockGitHub.context = {...originalContext} // Shallow clone
mockGitHub.context.ref = 'some-unqualified-ref'
const settings: ISourceSettings = inputHelper.getInputs()
expect(settings).toBeTruthy()
expect(settings.commit).toBe('1234567890123456789012345678901234567890')
expect(settings.ref).toBe('refs/heads/some-unqualified-ref')
} finally {
mockGitHub.context = originalContext
}
})
it('requires qualified repo', () => { it('requires qualified repo', () => {
inputs.repository = 'some-unqualified-repo' inputs.repository = 'some-unqualified-repo'
assert.throws(() => { assert.throws(() => {

5
dist/index.js vendored
View file

@ -12757,6 +12757,11 @@ function getInputs() {
if (isWorkflowRepository) { if (isWorkflowRepository) {
result.ref = github.context.ref; result.ref = github.context.ref;
result.commit = github.context.sha; result.commit = github.context.sha;
// Some events have an unqualifed ref. For example when a PR is merged (pull_request closed event),
// the ref is unqualifed like "master" instead of "refs/heads/master".
if (result.commit && result.ref && !result.ref.startsWith('refs/')) {
result.ref = `refs/heads/${result.ref}`;
}
} }
if (!result.ref && !result.commit) { if (!result.ref && !result.commit) {
result.ref = 'refs/heads/master'; result.ref = 'refs/heads/master';

View file

@ -61,6 +61,12 @@ export function getInputs(): ISourceSettings {
if (isWorkflowRepository) { if (isWorkflowRepository) {
result.ref = github.context.ref result.ref = github.context.ref
result.commit = github.context.sha result.commit = github.context.sha
// Some events have an unqualifed ref. For example when a PR is merged (pull_request closed event),
// the ref is unqualifed like "master" instead of "refs/heads/master".
if (result.commit && result.ref && !result.ref.startsWith('refs/')) {
result.ref = `refs/heads/${result.ref}`
}
} }
if (!result.ref && !result.commit) { if (!result.ref && !result.commit) {