Merge branch 'main' into patch-1

actions · Nov 30, 2022 · cecb121 · cecb121
2 parents d67909b + 67198a6
commit cecb121
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 16 deletions.
diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml
@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set Node.js 16.x
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16.x
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Update the ${{ env.TAG_NAME }} tag
         id: update-major-tag
-        uses: actions/publish-action@v0.1.0
+        uses: actions/publish-action@v0.2.1
         with:
           source-tag: ${{ env.TAG_NAME }}
           slack-webhook: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set Node.JS
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 16.x
 

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/context.js b/src/context.js
@@ -12,7 +12,8 @@ function getRequiredVars() {
     actionsId: process.env.GITHUB_ACTION,
     githubToken: core.getInput('token'),
     githubApiUrl: process.env.GITHUB_API_URL ?? 'https://api.github.com',
-    artifactName: core.getInput('artifact_name') ?? 'github-pages',
+    githubServerUrl: process.env.GITHUB_SERVER_URL ?? 'https://github.com',
+    artifactName: core.getInput('artifact_name') || 'github-pages',
     isPreview: core.getInput('preview') === 'true'
   }
 }

diff --git a/src/deployment.js b/src/deployment.js
@@ -24,6 +24,7 @@ class Deployment {
     this.requestedDeployment = false
     this.deploymentInfo = null
     this.githubApiUrl = context.githubApiUrl
+    this.githubServerUrl = context.githubServerUrl
     this.artifactName = context.artifactName
     this.isPreview = context.isPreview === true
   }
@@ -94,7 +95,8 @@ class Deployment {
         } else if (error.response.status == 403) {
           errorMessage += `Ensure GITHUB_TOKEN has permission "pages: write".`
         } else if (error.response.status == 404) {
-          errorMessage += `Ensure GitHub Pages has been enabled.`
+          const pagesSettingsUrl = `${this.githubServerUrl}/${this.repositoryNwo}/settings/pages`
+          errorMessage += `Ensure GitHub Pages has been enabled: ${pagesSettingsUrl}`
         } 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.`
         }