Read-only mirror — the public repositories of the Forgejo instance, refreshed every 10 minutes. The live instance (fg.dieschoenewolke.de) is reachable only over the VPN; clone here with https://git.dieschoenewolke.de/git/<owner>/<repo>.git.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreric sciple <ericsciple@users.noreply.github.com>2020-01-21 14:17:04 -0500
committerGitHub <noreply@github.com>2020-01-21 14:17:04 -0500
commit12bd1637c11cfa549d99e323740931f7481924d7 (patch)
treedd6867ece1cf77c75e956bbfe52cb1efbccef21f
parent7ca3468192f1fa956e1fcc853baedb79587fe236 (diff)
fix ref for pr closed event when a pr is merged (#141)
-rw-r--r--__test__/input-helper.test.ts14
-rw-r--r--dist/index.js5
-rw-r--r--src/input-helper.ts6
3 files changed, 25 insertions, 0 deletions
diff --git a/__test__/input-helper.test.ts b/__test__/input-helper.test.ts
index ecd3cd1..778c6eb 100644
--- a/__test__/input-helper.test.ts
+++ b/__test__/input-helper.test.ts
@@ -75,6 +75,20 @@ describe('input-helper tests', () => {
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', () => {
inputs.repository = 'some-unqualified-repo'
assert.throws(() => {
diff --git a/dist/index.js b/dist/index.js
index 1919193..c58ef35 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -12757,6 +12757,11 @@ function getInputs() {
if (isWorkflowRepository) {
result.ref = github.context.ref;
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) {
result.ref = 'refs/heads/master';
diff --git a/src/input-helper.ts b/src/input-helper.ts
index 56b58f2..54339da 100644
--- a/src/input-helper.ts
+++ b/src/input-helper.ts
@@ -61,6 +61,12 @@ export function getInputs(): ISourceSettings {
if (isWorkflowRepository) {
result.ref = github.context.ref
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) {