Merge branch 'main' into win-4-retry-flaky-tests

opensearch-project · Dec 1, 2022 · e559361 · e559361
2 parents a3dfa1e + 3f576df
commit e559361
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -69,6 +69,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Temporary workaround for task-kill exceptions on Windows when it is passed a pid for a process that is already dead ([#2842](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2842))
 - [Vis Builder] Fix empty workspace animation does not work in firefox ([#2853](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2853))
 - Bumped `del` version to fix MacOS race condition ([#2847](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2873))
+- [Build] Fixed "Last Access Time" not being set by `scanCopy` on Windows ([#2964](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2964))
 
 ### 🚞 Infrastructure
 
@@ -99,6 +100,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Multi DataSource] Add unit test coverage for Update Data source management stack ([#2567](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2567))
 - [BWC Tests] Add BWC tests for 2.5.0 ([#2890](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2890))
 - Add retrial of flaky tests ([#2967](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2967))
+- Fix incorrect validation of time values in JUnit Reporter ([#2965](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2965))
 
 ## [2.x]
 

diff --git a/dev-tools/get-version.sh b/dev-tools/get-version.sh
diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
     "docs:acceptApiChanges": "node --max-old-space-size=6144 scripts/check_published_api_changes.js --accept",
     "osd:bootstrap": "node scripts/build_ts_refs && node scripts/register_git_hook",
     "spec_to_console": "node scripts/spec_to_console",
-    "pkg-version": "./dev-tools/get-version.sh"
+    "pkg-version": "node -e \"console.log(require('./package.json').version)\""
   },
   "repository": {
     "type": "git",

diff --git a/src/dev/build/lib/scan_copy.ts b/src/dev/build/lib/scan_copy.ts
@@ -107,13 +107,13 @@ export async function scanCopy(options: Options) {
       await copyFileAsync(record.absolute, record.absoluteDest, Fs.constants.COPYFILE_EXCL);
     }
 
-    if (time) {
-      await utimesAsync(record.absoluteDest, time, time);
-    }
-
     if (record.isDirectory) {
       await copyChildren(record);
     }
+
+    if (time) {
+      await utimesAsync(record.absoluteDest, time, time);
+    }
   };
 
   await mkdirp(destination);

diff --git a/src/dev/jest/junit_reporter.js b/src/dev/jest/junit_reporter.js
@@ -70,8 +70,9 @@ export default class JestJUnitReporter {
       { skipNullAttributes: true }
     );
 
-    const msToIso = (ms) => (ms ? new Date(ms).toISOString().slice(0, -5) : undefined);
-    const msToSec = (ms) => (ms ? (ms / 1000).toFixed(3) : undefined);
+    const isNumeric = (val) => !isNaN(parseFloat(val)) && isFinite(val);
+    const msToIso = (ms) => (isNumeric(ms) ? new Date(ms).toISOString().slice(0, -5) : undefined);
+    const msToSec = (ms) => (isNumeric(ms) ? (ms / 1000).toFixed(3) : undefined);
 
     root.att({
       name: 'jest',