From 59705dc4071c9d9a71eb2e70a1bed03092daf841 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:12:07 +0100 Subject: [PATCH 1/3] Re-order filepath change logging --- FlowPlugins/FlowHelpers/1.0.0/classicPlugins.js | 2 +- FlowPluginsTs/FlowHelpers/1.0.0/classicPlugins.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FlowPlugins/FlowHelpers/1.0.0/classicPlugins.js b/FlowPlugins/FlowHelpers/1.0.0/classicPlugins.js index 5050875..69a6e69 100644 --- 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 index 22ee25c..ca6a0eb 100644 --- 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 { From 25895a51c22df95f26caa25b5934470a827807aa Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:25:06 +0100 Subject: [PATCH 2/3] Use macos-14 --- .github/workflows/lint_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint_and_test.yml b/.github/workflows/lint_and_test.yml index f7fa63d..83b0350 100644 --- a/.github/workflows/lint_and_test.yml +++ b/.github/workflows/lint_and_test.yml @@ -13,7 +13,7 @@ jobs: [ ["ubuntu-20.04"], ["windows-2019"], - ["macos-11.0"], + ["macos-14"], ] runs-on: ${{ matrix.os }} From 90402f2a07b56ea507828edcd0640acd5b739ea1 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:29:54 +0100 Subject: [PATCH 3/3] Use windows-2022 --- .github/workflows/lint_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint_and_test.yml b/.github/workflows/lint_and_test.yml index 83b0350..a57ab7e 100644 --- a/.github/workflows/lint_and_test.yml +++ b/.github/workflows/lint_and_test.yml @@ -12,7 +12,7 @@ jobs: os: [ ["ubuntu-20.04"], - ["windows-2019"], + ["windows-2022"], ["macos-14"], ] runs-on: ${{ matrix.os }}