From a1d8020f664598a28fc17bdace0ad8d2b3e46de4 Mon Sep 17 00:00:00 2001 From: Hunter Johnston Date: Sat, 6 Jan 2024 20:05:33 -0500 Subject: [PATCH] round 2 --- index.js | 11 ++++++----- src/index.ts | 12 +++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/index.js b/index.js index 53bb248..7f6e677 100644 --- a/index.js +++ b/index.js @@ -22108,15 +22108,16 @@ try { const githubBranch = import_process.env.GITHUB_HEAD_REF || import_process.env.GITHUB_REF_NAME; const createGitHubDeployment = async (octokit, productionEnvironment, environment) => { const deployment = await octokit.rest.repos.createDeployment({ - owner: import_github.context.repo.owner, - repo: import_github.context.repo.repo, - ref: import_github.context.ref, + owner: import_github.context.payload.pull_request?.head.repo.owner.login || import_github.context.repo.owner, + repo: import_github.context.payload.pull_request?.head.repo.name || import_github.context.repo.repo, + ref: import_github.context.payload.pull_request?.head.ref || import_github.context.ref, auto_merge: false, description: "Cloudflare Pages", required_contexts: [], environment, production_environment: productionEnvironment }); + console.log(deployment); if (deployment.status === 201) { return deployment.data; } @@ -22130,8 +22131,8 @@ try { octokit }) => { await octokit.rest.repos.createDeploymentStatus({ - owner: import_github.context.repo.owner, - repo: import_github.context.repo.repo, + owner: import_github.context.payload.pull_request?.head.repo.owner.login || import_github.context.repo.owner, + repo: import_github.context.payload.pull_request?.head.repo.name || import_github.context.repo.repo, deployment_id: id, environment: environmentName, environment_url: url, diff --git a/src/index.ts b/src/index.ts index 3adb2f1..fdfc2fb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -64,9 +64,9 @@ try { const createGitHubDeployment = async (octokit: Octokit, productionEnvironment: boolean, environment: string) => { const deployment = await octokit.rest.repos.createDeployment({ - owner: context.repo.owner, - repo: context.repo.repo, - ref: context.ref, + owner: context.payload.pull_request?.head.repo.owner.login || context.repo.owner, + repo: context.payload.pull_request?.head.repo.name || context.repo.repo, + ref: context.payload.pull_request?.head.ref || context.ref, auto_merge: false, description: "Cloudflare Pages", required_contexts: [], @@ -74,6 +74,8 @@ try { production_environment: productionEnvironment, }); + console.log(deployment); + if (deployment.status === 201) { return deployment.data; } @@ -95,8 +97,8 @@ try { productionEnvironment: boolean; }) => { await octokit.rest.repos.createDeploymentStatus({ - owner: context.repo.owner, - repo: context.repo.repo, + owner: context.payload.pull_request?.head.repo.owner.login || context.repo.owner, + repo: context.payload.pull_request?.head.repo.name || context.repo.repo, deployment_id: id, // @ts-ignore environment: environmentName,