Compare commits

..

4 Commits

Author SHA1 Message Date
Jess Bees
4c4a9146cc set host header 2022-11-16 12:31:22 -05:00
Jess Bees
88e44eb7c2 use different env var 2022-11-16 12:27:35 -05:00
Jess Bees
5c24c29b4d report the env var 2022-11-16 12:21:11 -05:00
Jess Bees
0f34457470 report api url 2022-11-16 11:26:58 -05:00
7 changed files with 25 additions and 25 deletions

View File

@@ -21,10 +21,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v2
- name: Set Node.js 16.x - name: Set Node.js 16.x
uses: actions/setup-node@v3 uses: actions/setup-node@v1
with: with:
node-version: 16.x node-version: 16.x

View File

@@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v2
- name: Set Node.JS - name: Set Node.JS
uses: actions/setup-node@v3 uses: actions/setup-node@v2
with: with:
node-version: 16.x node-version: 16.x

14
dist/index.js vendored
View File

@@ -6908,9 +6908,8 @@ function getRequiredVars() {
buildActor: process.env.GITHUB_ACTOR, buildActor: process.env.GITHUB_ACTOR,
actionsId: process.env.GITHUB_ACTION, actionsId: process.env.GITHUB_ACTION,
githubToken: core.getInput('token'), githubToken: core.getInput('token'),
githubApiUrl: process.env.GITHUB_API_URL ?? 'https://api.github.com', githubApiUrl: process.env.GITHUB_API_CUSTOM_URL ?? process.env.GITHUB_API_URL ?? 'https://api.github.com',
githubServerUrl: process.env.GITHUB_SERVER_URL ?? 'https://github.com', artifactName: core.getInput('artifact_name') ?? 'github-pages',
artifactName: core.getInput('artifact_name') || 'github-pages',
isPreview: core.getInput('preview') === 'true' isPreview: core.getInput('preview') === 'true'
} }
} }
@@ -6958,7 +6957,6 @@ class Deployment {
this.requestedDeployment = false this.requestedDeployment = false
this.deploymentInfo = null this.deploymentInfo = null
this.githubApiUrl = context.githubApiUrl this.githubApiUrl = context.githubApiUrl
this.githubServerUrl = context.githubServerUrl
this.artifactName = context.artifactName this.artifactName = context.artifactName
this.isPreview = context.isPreview === true this.isPreview = context.isPreview === true
} }
@@ -6996,11 +6994,14 @@ class Deployment {
payload.preview = true payload.preview = true
} }
core.info(`Creating deployment with payload:\n${JSON.stringify(payload, null, '\t')}`) core.info(`Creating deployment with payload:\n${JSON.stringify(payload, null, '\t')}`)
core.info(`Sending payload to: ${pagesDeployEndpoint}`)
core.info(`It should be sent do: ${process.env.GITHUB_API_CUSTOM_URL}`)
const response = await axios.post(pagesDeployEndpoint, payload, { const response = await axios.post(pagesDeployEndpoint, payload, {
headers: { headers: {
Accept: 'application/vnd.github.v3+json', Accept: 'application/vnd.github.v3+json',
Authorization: `Bearer ${this.githubToken}`, Authorization: `Bearer ${this.githubToken}`,
'Content-type': 'application/json' 'Content-type': 'application/json',
Host: 'api.github.com'
} }
}) })
this.requestedDeployment = true this.requestedDeployment = true
@@ -7029,8 +7030,7 @@ class Deployment {
} else if (error.response.status == 403) { } else if (error.response.status == 403) {
errorMessage += `Ensure GITHUB_TOKEN has permission "pages: write".` errorMessage += `Ensure GITHUB_TOKEN has permission "pages: write".`
} else if (error.response.status == 404) { } else if (error.response.status == 404) {
const pagesSettingsUrl = `${this.githubServerUrl}/${this.repositoryNwo}/settings/pages` errorMessage += `Ensure GitHub Pages has been enabled.`
errorMessage += `Ensure GitHub Pages has been enabled: ${pagesSettingsUrl}`
} else if (error.response.status >= 500) { } else if (error.response.status >= 500) {
errorMessage += `Server error, is githubstatus.com reporting a Pages outage? Please re-run the deployment at a later time.` errorMessage += `Server error, is githubstatus.com reporting a Pages outage? Please re-run the deployment at a later time.`
} }

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

12
package-lock.json generated
View File

@@ -4767,9 +4767,9 @@
} }
}, },
"node_modules/minimatch": { "node_modules/minimatch": {
"version": "3.1.2", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
@@ -9694,9 +9694,9 @@
"dev": true "dev": true
}, },
"minimatch": { "minimatch": {
"version": "3.1.2", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true, "dev": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"

View File

@@ -11,9 +11,8 @@ function getRequiredVars() {
buildActor: process.env.GITHUB_ACTOR, buildActor: process.env.GITHUB_ACTOR,
actionsId: process.env.GITHUB_ACTION, actionsId: process.env.GITHUB_ACTION,
githubToken: core.getInput('token'), githubToken: core.getInput('token'),
githubApiUrl: process.env.GITHUB_API_URL ?? 'https://api.github.com', githubApiUrl: process.env.GITHUB_API_CUSTOM_URL ?? process.env.GITHUB_API_URL ?? 'https://api.github.com',
githubServerUrl: process.env.GITHUB_SERVER_URL ?? 'https://github.com', artifactName: core.getInput('artifact_name') ?? 'github-pages',
artifactName: core.getInput('artifact_name') || 'github-pages',
isPreview: core.getInput('preview') === 'true' isPreview: core.getInput('preview') === 'true'
} }
} }

View File

@@ -24,7 +24,6 @@ class Deployment {
this.requestedDeployment = false this.requestedDeployment = false
this.deploymentInfo = null this.deploymentInfo = null
this.githubApiUrl = context.githubApiUrl this.githubApiUrl = context.githubApiUrl
this.githubServerUrl = context.githubServerUrl
this.artifactName = context.artifactName this.artifactName = context.artifactName
this.isPreview = context.isPreview === true this.isPreview = context.isPreview === true
} }
@@ -62,11 +61,14 @@ class Deployment {
payload.preview = true payload.preview = true
} }
core.info(`Creating deployment with payload:\n${JSON.stringify(payload, null, '\t')}`) core.info(`Creating deployment with payload:\n${JSON.stringify(payload, null, '\t')}`)
core.info(`Sending payload to: ${pagesDeployEndpoint}`)
core.info(`It should be sent do: ${process.env.GITHUB_API_CUSTOM_URL}`)
const response = await axios.post(pagesDeployEndpoint, payload, { const response = await axios.post(pagesDeployEndpoint, payload, {
headers: { headers: {
Accept: 'application/vnd.github.v3+json', Accept: 'application/vnd.github.v3+json',
Authorization: `Bearer ${this.githubToken}`, Authorization: `Bearer ${this.githubToken}`,
'Content-type': 'application/json' 'Content-type': 'application/json',
Host: 'api.github.com'
} }
}) })
this.requestedDeployment = true this.requestedDeployment = true
@@ -95,8 +97,7 @@ class Deployment {
} else if (error.response.status == 403) { } else if (error.response.status == 403) {
errorMessage += `Ensure GITHUB_TOKEN has permission "pages: write".` errorMessage += `Ensure GITHUB_TOKEN has permission "pages: write".`
} else if (error.response.status == 404) { } else if (error.response.status == 404) {
const pagesSettingsUrl = `${this.githubServerUrl}/${this.repositoryNwo}/settings/pages` errorMessage += `Ensure GitHub Pages has been enabled.`
errorMessage += `Ensure GitHub Pages has been enabled: ${pagesSettingsUrl}`
} else if (error.response.status >= 500) { } else if (error.response.status >= 500) {
errorMessage += `Server error, is githubstatus.com reporting a Pages outage? Please re-run the deployment at a later time.` errorMessage += `Server error, is githubstatus.com reporting a Pages outage? Please re-run the deployment at a later time.`
} }