[7.x] [kbn/pm] use mtime of untracked files in bootstrap cache key (e…

…lastic#64293) (elastic#64604)
weltenwort · Apr 28, 2020 · 0911953 · 0911953
1 parent 2d275db
commit 0911953
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
@@ -57107,7 +57107,7 @@ async function getChangesForProjects(projects, kbn, log) {
   log.verbose('getting changed files');
   const {
     stdout
-  } = await execa__WEBPACK_IMPORTED_MODULE_3___default()('git', ['ls-files', '-dmt', '--', ...Array.from(projects.values()).filter(p => kbn.isPartOfRepo(p)).map(p => p.path)], {
+  } = await execa__WEBPACK_IMPORTED_MODULE_3___default()('git', ['ls-files', '-dmto', '--exclude-standard', '--', ...Array.from(projects.values()).filter(p => kbn.isPartOfRepo(p)).map(p => p.path)], {
     cwd: kbn.getAbsolute()
   });
   const output = stdout.trim();
@@ -57134,10 +57134,13 @@ async function getChangesForProjects(projects, kbn, log) {
           unassignedChanges.set(path, 'deleted');
           break;
 
+        case '?':
+          unassignedChanges.set(path, 'untracked');
+          break;
+
         case 'H':
         case 'S':
         case 'K':
-        case '?':
         default:
           log.warning(`unexpected modification status "${tag}" for ${path}, please report this!`);
           unassignedChanges.set(path, 'invalid');

diff --git a/packages/kbn-pm/src/utils/project_checksums.ts b/packages/kbn-pm/src/utils/project_checksums.ts
@@ -32,7 +32,7 @@ import { Kibana } from '../utils/kibana';
 
 export type ChecksumMap = Map<string, string | undefined>;
 /** map of [repo relative path to changed file, type of change] */
-type Changes = Map<string, 'modified' | 'deleted' | 'invalid'>;
+type Changes = Map<string, 'modified' | 'deleted' | 'invalid' | 'untracked'>;
 
 const statAsync = promisify(Fs.stat);
 const projectBySpecificitySorter = (a: Project, b: Project) => b.path.length - a.path.length;
@@ -45,7 +45,8 @@ async function getChangesForProjects(projects: ProjectMap, kbn: Kibana, log: Too
     'git',
     [
       'ls-files',
-      '-dmt',
+      '-dmto',
+      '--exclude-standard',
       '--',
       ...Array.from(projects.values())
         .filter(p => kbn.isPartOfRepo(p))
@@ -78,10 +79,13 @@ async function getChangesForProjects(projects: ProjectMap, kbn: Kibana, log: Too
           unassignedChanges.set(path, 'deleted');
           break;
 
+        case '?':
+          unassignedChanges.set(path, 'untracked');
+          break;
+
         case 'H':
         case 'S':
         case 'K':
-        case '?':
         default:
           log.warning(`unexpected modification status "${tag}" for ${path}, please report this!`);
           unassignedChanges.set(path, 'invalid');