Create GitHub deployment using correct branch name (#70)

pull/80/head
Aaron Adams 2 years ago committed by GitHub
parent 61eafe73ba
commit 586d3c53b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -22095,11 +22095,12 @@ try {
} = await response.json(); } = await response.json();
return deployment; return deployment;
}; };
const githubBranch = import_process.env.GITHUB_HEAD_REF || import_process.env.GITHUB_REF_NAME;
const createGitHubDeployment = async (octokit, productionEnvironment, environment) => { const createGitHubDeployment = async (octokit, productionEnvironment, environment) => {
const deployment = await octokit.rest.repos.createDeployment({ const deployment = await octokit.rest.repos.createDeployment({
owner: import_github.context.repo.owner, owner: import_github.context.repo.owner,
repo: import_github.context.repo.repo, repo: import_github.context.repo.repo,
ref: import_github.context.ref, ref: githubBranch || import_github.context.ref,
auto_merge: false, auto_merge: false,
description: "Cloudflare Pages", description: "Cloudflare Pages",
required_contexts: [], required_contexts: [],
@ -22156,7 +22157,6 @@ try {
const project = await getProject(); const project = await getProject();
if (!project) if (!project)
throw new Error("Unable to find pages project"); throw new Error("Unable to find pages project");
const githubBranch = import_process.env.GITHUB_REF_NAME;
const productionEnvironment = githubBranch === project.production_branch; const productionEnvironment = githubBranch === project.production_branch;
const environmentName = `${projectName} (${productionEnvironment ? "Production" : "Preview"})`; const environmentName = `${projectName} (${productionEnvironment ? "Production" : "Preview"})`;
let gitHubDeployment; let gitHubDeployment;

@ -48,11 +48,13 @@ try {
return deployment; return deployment;
}; };
const githubBranch = env.GITHUB_HEAD_REF || env.GITHUB_REF_NAME;
const createGitHubDeployment = async (octokit: Octokit, productionEnvironment: boolean, environment: string) => { const createGitHubDeployment = async (octokit: Octokit, productionEnvironment: boolean, environment: string) => {
const deployment = await octokit.rest.repos.createDeployment({ const deployment = await octokit.rest.repos.createDeployment({
owner: context.repo.owner, owner: context.repo.owner,
repo: context.repo.repo, repo: context.repo.repo,
ref: context.ref, ref: githubBranch || context.ref,
auto_merge: false, auto_merge: false,
description: "Cloudflare Pages", description: "Cloudflare Pages",
required_contexts: [], required_contexts: [],
@ -125,7 +127,6 @@ try {
const project = await getProject(); const project = await getProject();
if (!project) throw new Error("Unable to find pages project"); if (!project) throw new Error("Unable to find pages project");
const githubBranch = env.GITHUB_REF_NAME;
const productionEnvironment = githubBranch === project.production_branch; const productionEnvironment = githubBranch === project.production_branch;
const environmentName = `${projectName} (${productionEnvironment ? "Production" : "Preview"})`; const environmentName = `${projectName} (${productionEnvironment ? "Production" : "Preview"})`;

Loading…
Cancel
Save