Merge pull request #42 from zentered/release

EMS Release

.github/workflows/test.yml

@@ -24,7 +24,7 @@ jobs:
         uses: github/super-linter@v4.9.0
         env:
           LINTER_RULES_PATH: /
-          FILTER_REGEX_EXCLUDE: (.*dist\/.*)|(.husky\/.*)
+          FILTER_REGEX_EXCLUDE: (.*dist\/.*)|(.husky\/.*)|(.test\/.*)
           JAVASCRIPT_ES_CONFIG_FILE: .eslintrc.json
           VALIDATE_ALL_CODEBASE: true
           VALIDATE_JAVASCRIPT_STANDARD: false

README.md

@@ -5,7 +5,7 @@
 ![Semantic Release](https://github.com/govolition/storefront-api/workflows/Semantic%20Release/badge.svg)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
 
-Retrieve the preview URL from the Cloudflare API, filtered by the repo and branch. The URL can then be used for further end-to-end tests, link checks and other PR integrations/actions.
+Retrieve the preview URL from the Cloudflare API, filtered by the repository and branch. The URL can then be used for further end-to-end tests, link checks and other PR integrations/actions.
 
 ## Table of Contents
 
@@ -57,7 +57,7 @@ timeout-minutes: 10
 
 In the repository, go to "Settings", then "Secrets" and add "CLOUDFLARE_API_TOKEN", the value you can retrieve on your [Cloudflare account](https://dash.cloudflare.com/profile/api-tokens). You also need to add:
 
-- `CLOUDFLARE_ACCOUNT_EMAIL` (your login email)
+- `CLOUDFLARE_ACCOUNT_EMAIL` (your login email, optional)
 - `CLOUDFLARE_ACCOUNT_ID` (from the URL: `https://dash.cloudflare.com/123abc....`)
 
 ## Inputs
@@ -68,6 +68,7 @@ In the repository, go to "Settings", then "Secrets" and add "CLOUDFLARE_API_TOKE
 | `wait_until_ready`      | optional    | Wait until the Cloudflare deployment is ready, defaults to "false"                                                              |
 | `environment`           | optional    | Which Cloudflare deployment environments to allow. If set to null, doesn't filter deploys by environment. Defaults to "preview" |
 | `commit_hash`           | optional    | Optional commit hash to filter deployments on. Useful when the same branch can have multiple deploys.                           |
+| `branch`                | optional    | Optional branch name to filter deployments on. Useful when the branch name is not available in the action context.              |
 
 ## Outputs
 

action.yml

@@ -17,6 +17,9 @@ inputs:
   commit_hash:
     description: "Optional commit hash to filter deployments on. Useful when the same branch can have multiple deploys."
     required: false
+  branch:
+    description: "Optional branch name to filter deployments on. Useful when the branch name is not available in the action context."
+    required: false
 name: Cloudflare Preview URL
 outputs:
   preview_url:

cloudflare-statuscheck.mjs → cloudflare-statuscheck.js

@@ -10,11 +10,17 @@ export default async function waitForDeployment(
 ) {
   const apiUrl = `https://api.cloudflare.com/client/v4/accounts/${accountId}/pages/projects/${projectId}/deployments`
 
+  const headers = accountEmail
+    ? {
+        'X-Auth-Key': token,
+        'X-Auth-Email': accountEmail
+      }
+    : {
+        Authorization: `Bearer ${token}`
+      }
+
   const { data } = await axios.get(apiUrl, {
-    headers: {
-      'X-Auth-Key': token,
-      'X-Auth-Email': accountEmail
-    },
+    headers,
     responseType: 'json',
     responseEncoding: 'utf8'
   })

cloudflare.mjs → cloudflare.js

@@ -19,11 +19,17 @@ export default async function getDeploymentUrl(
     core.info(`Fetching from: ${apiUrl}`)
   }
 
+  const headers = accountEmail
+    ? {
+        'X-Auth-Key': token,
+        'X-Auth-Email': accountEmail
+      }
+    : {
+        Authorization: `Bearer ${token}`
+      }
+
   const { data } = await axios.get(apiUrl, {
-    headers: {
-      'X-Auth-Key': token,
-      'X-Auth-Email': accountEmail
-    },
+    headers,
     responseType: 'json',
     responseEncoding: 'utf8'
   })