Merge remote-tracking branch 'upstream/main' into support-more-deployments-logic

Author: gjtorikian

.gitattributes

@@ -1 +1 @@
-dist/* linguist-generated
+dist/* linguist-generated -diff

README.md

@@ -255,7 +255,7 @@ jobs:
 
 This is the same as `deactivate-env`, except deletes the environment entirely. See [`step: deactivate-env`](#step-deactivate-env) for more details.
 
-Note that the default `GITHUB_TOKEN` does not allow environment deletion - you have to set a personal access token and provide it in the `token` input.
+Note that the default `GITHUB_TOKEN` does not allow environment deletion - you have to set a personal access token with `deployments:write` and `administration:write` permissions and provide it in the `token` input.
 
 Refer to the [core configuration](#configuration) for available [`inputs`](https://help.github.com/en/articles/workflow-syntax-for-github-actions#jobsjob_idstepswith).
 

action.yml

@@ -5,7 +5,7 @@ branding:
   icon: bookmark
   color: yellow
 runs:
-  using: node16
+  using: node20
   main: dist/index.js
 
 inputs:

dist/index.js

@@ -36,12 +36,24 @@ async function deleteEnvironment(
     log.info(`${environment}: ${existing} deployments deleted`);
   }
 
-  await github.rest.repos.deleteAnEnvironment({
-    owner: context.owner,
-    repo: context.repo,
-    environment_name: environment,
-  });
-  log.info(`${environment}: environment deleted`);
+  log.info(`deleting environment: "${environment}"`);
+  try {
+    await github.rest.repos.deleteAnEnvironment({
+      owner: context.owner,
+      repo: context.repo,
+      environment_name: environment,
+    });
+    log.info(`${environment}: environment deleted`);
+  } catch (error: any) {
+    if ("status" in error && error.status == 404) {
+      log.fail(
+        `got a 404 deleting ${environment}, check that your PAT has repo scope and that the pat user is an admin`
+      );
+    } else {
+      log.fail(`error while deleting ${environment}: ${error}`);
+      log.debug(error);
+    }
+  }
 }
 
 export default deleteEnvironment;