Merge pull request HaveAGitGat#684 from HaveAGitGat/classic

Re-order filepath change logging
KoenBoone · Jul 8, 2024 · 71f468f · 71f468f
2 parents 81d79ef + 90402f2
commit 71f468f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/lint_and_test.yml b/.github/workflows/lint_and_test.yml
@@ -12,8 +12,8 @@ jobs:
         os:
           [
             ["ubuntu-20.04"],
-            ["windows-2019"],
-            ["macos-11.0"],
+            ["windows-2022"],
+            ["macos-14"],
           ]
     runs-on: ${{ matrix.os }}
 

diff --git a/FlowPlugins/FlowHelpers/1.0.0/classicPlugins.js b/FlowPlugins/FlowHelpers/1.0.0/classicPlugins.js
@@ -153,11 +153,11 @@ var runClassicPlugin = function (args, type) { return __awaiter(void 0, void 0,
             case 16:
                 result = _b.sent();
                 if (((_a = result === null || result === void 0 ? void 0 : result.file) === null || _a === void 0 ? void 0 : _a._id) && args.inputFileObj._id !== result.file._id) {
+                    args.jobLog("File ID changed from ".concat(args.inputFileObj._id, " to ").concat(result.file._id));
                     // eslint-disable-next-line no-param-reassign
                     args.inputFileObj._id = result.file._id;
                     // eslint-disable-next-line no-param-reassign
                     args.inputFileObj.file = result.file.file;
-                    args.jobLog("File ID changed from ".concat(args.inputFileObj._id, " to ").concat(result.file._id));
                 }
                 return [2 /*return*/, {
                         result: result,

diff --git a/FlowPluginsTs/FlowHelpers/1.0.0/classicPlugins.ts b/FlowPluginsTs/FlowHelpers/1.0.0/classicPlugins.ts
@@ -149,11 +149,11 @@ export const runClassicPlugin = async (args:IpluginInputArgs, type:'filter'|'tra
   );
 
   if (result?.file?._id && args.inputFileObj._id !== result.file._id) {
+    args.jobLog(`File ID changed from ${args.inputFileObj._id} to ${result.file._id}`);
     // eslint-disable-next-line no-param-reassign
     args.inputFileObj._id = result.file._id;
     // eslint-disable-next-line no-param-reassign
     args.inputFileObj.file = result.file.file;
-    args.jobLog(`File ID changed from ${args.inputFileObj._id} to ${result.file._id}`);
   }
 
   return {