action: post-run-job: try clean daemon container, warn on failure (#61)

* flake: add typescript LSP tool * action: post-run-job: try clean daemon container, warn on failure
DeterminateSystems · Dec 19, 2023 · 21affdd · 21affdd
1 parent cd46bde
commit 21affdd
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 3 deletions.
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/flake.nix b/flake.nix
@@ -22,6 +22,7 @@
           packages = with pkgs; [
             nodejs_latest
             nixpkgs-fmt
+            nodePackages_latest.typescript-language-server
           ];
         };
       });

diff --git a/src/main.ts b/src/main.ts
@@ -521,10 +521,35 @@ class NixInstallerAction {
   }
   async cleanupDockerShim(): Promise<void> {
     const container_id = actions_core.getState("docker_shim_container_id");
+
     if (container_id !== "") {
       actions_core.startGroup("Cleaning up the Nix daemon's Docker shim");
 
-      await actions_exec.exec("docker", ["rm", "--force", container_id]);
+      let cleaned = false;
+      try {
+        await actions_exec.exec("docker", ["rm", "--force", container_id]);
+        cleaned = true;
+      } catch {
+        actions_core.warning("failed to cleanup nix daemon container");
+      }
+
+      if (!cleaned) {
+        actions_core.info("trying to pkill the container's shim process");
+        try {
+          await actions_exec.exec("pkill", [container_id]);
+          cleaned = true;
+        } catch {
+          actions_core.warning(
+            "failed to forcibly kill the container's shim process",
+          );
+        }
+      }
+
+      if (!cleaned) {
+        actions_core.warning(
+          "Giving up on cleaning up the nix daemon container",
+        );
+      }
 
       actions_core.endGroup();
     }