Merge 7f5cd168b9 into c319d26b5f

build(deps): bump crazy-max/ghaction-import-gpg from 6.2.0 to 6.3.0

action.yml

@@ -110,7 +110,7 @@ runs:
     - name: Import bot's GPG key for signing commits
       if: ${{ inputs.sign-commits == 'true' }}
       id: import-gpg
-      uses: crazy-max/ghaction-import-gpg@cb9bde2e2525e640591a934b1fd28eef1dcaf5e5 # v6.2.0
+      uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec # v6.3.0
       with:
         gpg_private_key: ${{ inputs.gpg-private-key }}
         fingerprint: ${{ inputs.gpg-fingerprint }}
@@ -202,7 +202,7 @@ runs:
       run: rm -f pr_body.txt pr_body.template
     - name: Create PR
       id: create-pr
-      uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
+      uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
       with:
         base: ${{ inputs.base }}
         branch: ${{ inputs.branch }}

dist/index.js

@@ -34921,7 +34921,7 @@ Object.defineProperty(exports, "readFieldOptions", ({ enumerable: true, get: fun
 Object.defineProperty(exports, "readFieldOption", ({ enumerable: true, get: function () { return reflection_info_1.readFieldOption; } }));
 Object.defineProperty(exports, "readMessageOption", ({ enumerable: true, get: function () { return reflection_info_1.readMessageOption; } }));
 // Message operations via reflection
-var reflection_type_check_1 = __nccwpck_require__(2664);
+var reflection_type_check_1 = __nccwpck_require__(283);
 Object.defineProperty(exports, "ReflectionTypeCheck", ({ enumerable: true, get: function () { return reflection_type_check_1.ReflectionTypeCheck; } }));
 var reflection_create_1 = __nccwpck_require__(8877);
 Object.defineProperty(exports, "reflectionCreate", ({ enumerable: true, get: function () { return reflection_create_1.reflectionCreate; } }));
@@ -35109,7 +35109,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.MessageType = void 0;
 const message_type_contract_1 = __nccwpck_require__(5114);
 const reflection_info_1 = __nccwpck_require__(7369);
-const reflection_type_check_1 = __nccwpck_require__(2664);
+const reflection_type_check_1 = __nccwpck_require__(283);
 const reflection_json_reader_1 = __nccwpck_require__(5855);
 const reflection_json_writer_1 = __nccwpck_require__(9359);
 const reflection_binary_reader_1 = __nccwpck_require__(3362);
@@ -37219,7 +37219,7 @@ exports.reflectionScalarDefault = reflectionScalarDefault;
 
 /***/ }),
 
-/***/ 2664:
+/***/ 283:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 
@@ -46977,7 +46977,7 @@ module.exports.mockErrors = mockErrors
 
 const { InvalidArgumentError } = __nccwpck_require__(1581)
 const { kClients, kRunning, kClose, kDestroy, kDispatch, kInterceptors } = __nccwpck_require__(5773)
-const DispatcherBase = __nccwpck_require__(2168)
+const DispatcherBase = __nccwpck_require__(9787)
 const Pool = __nccwpck_require__(6086)
 const Client = __nccwpck_require__(439)
 const util = __nccwpck_require__(4606)
@@ -49752,7 +49752,7 @@ const { pipeline } = __nccwpck_require__(2203)
 const util = __nccwpck_require__(4606)
 const timers = __nccwpck_require__(2374)
 const Request = __nccwpck_require__(3505)
-const DispatcherBase = __nccwpck_require__(2168)
+const DispatcherBase = __nccwpck_require__(9787)
 const {
   RequestContentLengthMismatchError,
   ResponseContentLengthMismatchError,
@@ -54558,7 +54558,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 2168:
+/***/ 9787:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 
@@ -66269,7 +66269,7 @@ module.exports = class FixedQueue {
 
 
 
-const DispatcherBase = __nccwpck_require__(2168)
+const DispatcherBase = __nccwpck_require__(9787)
 const FixedQueue = __nccwpck_require__(119)
 const { kConnected, kSize, kRunning, kPending, kQueued, kBusy, kFree, kUrl, kClose, kDestroy, kDispatch } = __nccwpck_require__(5773)
 const PoolStats = __nccwpck_require__(136)
@@ -66630,7 +66630,7 @@ const { kProxy, kClose, kDestroy, kInterceptors } = __nccwpck_require__(5773)
 const { URL } = __nccwpck_require__(7016)
 const Agent = __nccwpck_require__(8603)
 const Pool = __nccwpck_require__(6086)
-const DispatcherBase = __nccwpck_require__(2168)
+const DispatcherBase = __nccwpck_require__(9787)
 const { InvalidArgumentError, RequestAbortedError } = __nccwpck_require__(1581)
 const buildConnector = __nccwpck_require__(110)
 
@@ -87214,7 +87214,7 @@ var cache = __nccwpck_require__(7389);
 const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:child_process");
 ;// CONCATENATED MODULE: external "node:path"
 const external_node_path_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:path");
-;// CONCATENATED MODULE: ./node_modules/.pnpm/detsys-ts@https+++codeload.github.com+DeterminateSystems+detsys-ts+tar.gz+9d2b0e4636787_965914aa38ac1ed2d54aabb6d183fadd/node_modules/detsys-ts/dist/index.js
+;// CONCATENATED MODULE: ./node_modules/.pnpm/detsys-ts@https+++codeload.github.com+DeterminateSystems+detsys-ts+tar.gz+07c7fc924119a_cf9631eb801687d1d18b88d767b5ca88/node_modules/detsys-ts/dist/index.js
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -87441,16 +87441,25 @@ function stringifyError(e) {
 
 
 
-async function collectBacktraces(prefixes, startTimestampMs) {
+var START_SLOP_SECONDS = 5;
+async function collectBacktraces(prefixes, programNameDenyList, startTimestampMs) {
   if (isMacOS) {
-    return await collectBacktracesMacOS(prefixes, startTimestampMs);
+    return await collectBacktracesMacOS(
+      prefixes,
+      programNameDenyList,
+      startTimestampMs
+    );
   }
   if (isLinux) {
-    return await collectBacktracesSystemd(prefixes, startTimestampMs);
+    return await collectBacktracesSystemd(
+      prefixes,
+      programNameDenyList,
+      startTimestampMs
+    );
   }
   return /* @__PURE__ */ new Map();
 }
-async function collectBacktracesMacOS(prefixes, startTimestampMs) {
+async function collectBacktracesMacOS(prefixes, programNameDenyList, startTimestampMs) {
   const backtraces = /* @__PURE__ */ new Map();
   try {
     const { stdout: logJson } = await exec.getExecOutput(
@@ -87492,6 +87501,10 @@ async function collectBacktracesMacOS(prefixes, startTimestampMs) {
   for (const [source, dir] of dirs) {
     const fileNames = (await (0,promises_namespaceObject.readdir)(dir)).filter((fileName) => {
       return prefixes.some((prefix) => fileName.startsWith(prefix));
+    }).filter((fileName) => {
+      return !programNameDenyList.some(
+        (programName) => fileName.startsWith(programName)
+      );
     }).filter((fileName) => {
       return !fileName.endsWith(".diag");
     });
@@ -87516,8 +87529,8 @@ async function collectBacktracesMacOS(prefixes, startTimestampMs) {
   }
   return backtraces;
 }
-async function collectBacktracesSystemd(prefixes, startTimestampMs) {
+async function collectBacktracesSystemd(prefixes, programNameDenyList, startTimestampMs) {
-  const sinceSeconds = Math.ceil((Date.now() - startTimestampMs) / 1e3);
+  const sinceSeconds = Math.ceil((Date.now() - startTimestampMs) / 1e3) + START_SLOP_SECONDS;
   const backtraces = /* @__PURE__ */ new Map();
   const coredumps = [];
   try {
@@ -87538,7 +87551,7 @@ async function collectBacktracesSystemd(prefixes, startTimestampMs) {
         if (typeof sussyObject.exe == "string" && typeof sussyObject.pid == "number") {
           const execParts = sussyObject.exe.split("/");
           const binaryName = execParts[execParts.length - 1];
-          if (prefixes.some((prefix) => binaryName.startsWith(prefix))) {
+          if (prefixes.some((prefix) => binaryName.startsWith(prefix)) && !programNameDenyList.includes(binaryName)) {
             coredumps.push({
               exe: sussyObject.exe,
               pid: sussyObject.pid
@@ -88106,6 +88119,11 @@ var STATE_KEY_CROSS_PHASE_ID = "detsys_cross_phase_id";
 var STATE_BACKTRACE_START_TIMESTAMP = "detsys_backtrace_start_timestamp";
 var DIAGNOSTIC_ENDPOINT_TIMEOUT_MS = 1e4;
 var CHECK_IN_ENDPOINT_TIMEOUT_MS = 1e3;
+var PROGRAM_NAME_CRASH_DENY_LIST = [
+  "nix-expr-tests",
+  "nix-store-tests",
+  "nix-util-tests"
+];
 var DetSysAction = class {
   determineExecutionPhase() {
     const currentPhase = core.getState(STATE_KEY_EXECUTION_PHASE);
@@ -88638,7 +88656,7 @@ var DetSysAction = class {
     }
   }
   collectBacktraceSetup() {
-    if (process.env.DETSYS_BACKTRACE_COLLECTOR === "") {
+    if (!process.env.DETSYS_BACKTRACE_COLLECTOR) {
       core.exportVariable(
         "DETSYS_BACKTRACE_COLLECTOR",
         this.getCrossPhaseId()
@@ -88653,6 +88671,7 @@ var DetSysAction = class {
       }
       const backtraces = await collectBacktraces(
         this.actionOptions.binaryNamePrefixes,
+        this.actionOptions.binaryNamesDenyList,
         parseInt(core.getState(STATE_BACKTRACE_START_TIMESTAMP))
       );
       core.debug(`Backtraces identified: ${backtraces.size}`);
@@ -88797,7 +88816,8 @@ function makeOptionsConfident(actionOptions) {
       "nix",
       "determinate-nixd",
       actionOptions.name
-    ]
+    ],
+    binaryNamesDenyList: actionOptions.binaryNamePrefixes ?? PROGRAM_NAME_CRASH_DENY_LIST
   };
   core.debug("idslib options:");
   core.debug(JSON.stringify(finalOpts, void 0, 2));

package.json

@@ -35,13 +35,13 @@
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@vercel/ncc": "^0.38.3",
     "eslint": "^8.57.1",
-    "eslint-import-resolver-typescript": "^3.9.1",
+    "eslint-import-resolver-typescript": "^3.10.0",
     "eslint-plugin-github": "^4.10.2",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-prettier": "^5.2.3",
+    "eslint-plugin-prettier": "^5.2.5",
     "prettier": "^3.5.3",
     "tsup": "^8.4.0",
     "typescript": "^5.8.2",
-    "vitest": "^1.6.1"
+    "vitest": "^3.0.9"
   }
 }