From 271cb12f177a11923e270187d9d40c34987b3be4 Mon Sep 17 00:00:00 2001 From: Daniel Walsh Date: Tue, 22 Nov 2022 10:21:19 +0000 Subject: [PATCH] Fix alias issue --- index.js | 6 +++++- package-lock.json | 14 +++++++------- package.json | 2 +- src/index.ts | 15 +++++++-------- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/index.js b/index.js index aa4bd4c..844ffba 100644 --- a/index.js +++ b/index.js @@ -22146,7 +22146,11 @@ try { (0, import_core.setOutput)("id", pagesDeployment.id); (0, import_core.setOutput)("url", pagesDeployment.url); (0, import_core.setOutput)("environment", pagesDeployment.environment); - (0, import_core.setOutput)("alias", productionEnvironment ? pagesDeployment.url : pagesDeployment.aliases[0]); + let alias = pagesDeployment.url; + if (!productionEnvironment && pagesDeployment.aliases && pagesDeployment.aliases.length > 0) { + alias = pagesDeployment.aliases[0]; + } + (0, import_core.setOutput)("alias", alias); if (gitHubDeployment) { await createGitHubDeploymentStatus({ id: gitHubDeployment.id, diff --git a/package-lock.json b/package-lock.json index e353168..7f2c6ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@actions/core": "^1.10.0", "@actions/github": "^5.1.1", - "@cloudflare/types": "^6.16.10", + "@cloudflare/types": "^6.18.16", "shellac": "^0.7.2", "undici": "^5.11.0" }, @@ -60,9 +60,9 @@ } }, "node_modules/@cloudflare/types": { - "version": "6.16.10", - "resolved": "https://registry.npmjs.org/@cloudflare/types/-/types-6.16.10.tgz", - "integrity": "sha512-bUh3ONoTS/31LBo+C0bKpuBRT5bSl9Cnb/VwYeyHPEedYd0qtCR+fhLFCzFhi9qWk9+PXd6cTGR1mBLgi1gl4A==", + "version": "6.18.16", + "resolved": "https://registry.npmjs.org/@cloudflare/types/-/types-6.18.16.tgz", + "integrity": "sha512-CTlwcgdnksgnifcWj91mUCDn9gdm8NAG4dQ8NzVv3IrQT+YuhBJxXelJwucJZQYv7hL/gzbveyf/ikP6kljsdA==", "dependencies": { "@cloudflare/intl-types": "^1.2.0", "@cloudflare/util-en-garde": "^8.0.10" @@ -842,9 +842,9 @@ "requires": {} }, "@cloudflare/types": { - "version": "6.16.10", - "resolved": "https://registry.npmjs.org/@cloudflare/types/-/types-6.16.10.tgz", - "integrity": "sha512-bUh3ONoTS/31LBo+C0bKpuBRT5bSl9Cnb/VwYeyHPEedYd0qtCR+fhLFCzFhi9qWk9+PXd6cTGR1mBLgi1gl4A==", + "version": "6.18.16", + "resolved": "https://registry.npmjs.org/@cloudflare/types/-/types-6.18.16.tgz", + "integrity": "sha512-CTlwcgdnksgnifcWj91mUCDn9gdm8NAG4dQ8NzVv3IrQT+YuhBJxXelJwucJZQYv7hL/gzbveyf/ikP6kljsdA==", "requires": { "@cloudflare/intl-types": "^1.2.0", "@cloudflare/util-en-garde": "^8.0.10" diff --git a/package.json b/package.json index 0112d55..1cec245 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "dependencies": { "@actions/core": "^1.10.0", "@actions/github": "^5.1.1", - "@cloudflare/types": "^6.16.10", + "@cloudflare/types": "^6.18.16", "shellac": "^0.7.2", "undici": "^5.11.0" }, diff --git a/src/index.ts b/src/index.ts index 02902aa..f4fd01f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,13 +3,7 @@ import { context, getOctokit } from "@actions/github"; import shellac from "shellac"; import { fetch } from "undici"; import { env } from "process"; -import type { Deployment } from '@cloudflare/types'; - -// TODO: Add Project to @cloudflare/types -interface Project { - name: string; - production_branch: string; -} +import type { Project, Deployment } from '@cloudflare/types'; try { const apiToken = getInput("apiToken", { required: true }); @@ -121,7 +115,12 @@ try { setOutput("id", pagesDeployment.id); setOutput("url", pagesDeployment.url); setOutput("environment", pagesDeployment.environment); - setOutput("alias", productionEnvironment ? pagesDeployment.url : pagesDeployment.aliases[0]); + + let alias = pagesDeployment.url; + if (!productionEnvironment && pagesDeployment.aliases && pagesDeployment.aliases.length > 0) { + alias = pagesDeployment.aliases[0]; + } + setOutput("alias", alias); if (gitHubDeployment) { await createGitHubDeploymentStatus({