From 61eafe73baad0195ab582cb447b2c6e15a0df9ce Mon Sep 17 00:00:00 2001 From: James Ross Date: Thu, 9 Mar 2023 22:48:44 +0000 Subject: [PATCH] Revert "Fix branch name for `pull_request` events" (#68) --- action.yml | 1 - index.js | 12 +++++++----- src/index.ts | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/action.yml b/action.yml index eb5c6bc..8d8d8e9 100644 --- a/action.yml +++ b/action.yml @@ -22,7 +22,6 @@ inputs: branch: description: "The name of the branch you want to deploy to" required: false - default: "${{ github.head_ref || github.ref_name }}" workingDirectory: description: "The working directory in which to run Wrangler" required: false diff --git a/index.js b/index.js index 44f752c..cfade9e 100644 --- a/index.js +++ b/index.js @@ -21114,12 +21114,12 @@ var __publicField2 = (obj, key, value) => { var Shell = class { constructor(env_passthrough = ["PATH"]) { __publicField(this, "process"); - const env = { PS1: "" }; + const env2 = { PS1: "" }; env_passthrough.forEach((key) => { - env[key] = process.env[key]; + env2[key] = process.env[key]; }); this.process = import_child_process.default.spawn("bash", ["--noprofile", "--norc"], { - env, + env: env2, detached: true }); this.process.stdout.setEncoding("utf8"); @@ -22059,6 +22059,7 @@ var src_default = shellac; // src/index.ts var import_undici = __toESM(require_undici()); +var import_process = require("process"); var import_node_path = __toESM(require("path")); try { const apiToken = (0, import_core.getInput)("apiToken", { required: true }); @@ -22098,7 +22099,7 @@ try { const deployment = await octokit.rest.repos.createDeployment({ owner: import_github.context.repo.owner, repo: import_github.context.repo.repo, - ref: branch, + ref: import_github.context.ref, auto_merge: false, description: "Cloudflare Pages", required_contexts: [], @@ -22155,7 +22156,8 @@ try { const project = await getProject(); if (!project) throw new Error("Unable to find pages project"); - const productionEnvironment = branch === project.production_branch; + const githubBranch = import_process.env.GITHUB_REF_NAME; + const productionEnvironment = githubBranch === project.production_branch; const environmentName = `${projectName} (${productionEnvironment ? "Production" : "Preview"})`; let gitHubDeployment; if (gitHubToken && gitHubToken.length) { diff --git a/src/index.ts b/src/index.ts index 8d0dea5..8e7fe88 100644 --- a/src/index.ts +++ b/src/index.ts @@ -52,7 +52,7 @@ try { const deployment = await octokit.rest.repos.createDeployment({ owner: context.repo.owner, repo: context.repo.repo, - ref: branch, + ref: context.ref, auto_merge: false, description: "Cloudflare Pages", required_contexts: [], @@ -125,7 +125,8 @@ try { const project = await getProject(); if (!project) throw new Error("Unable to find pages project"); - const productionEnvironment = branch === project.production_branch; + const githubBranch = env.GITHUB_REF_NAME; + const productionEnvironment = githubBranch === project.production_branch; const environmentName = `${projectName} (${productionEnvironment ? "Production" : "Preview"})`; let gitHubDeployment: Awaited>;