From a0d775d4b9ba8237080723b6a6425e056c18728d Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Wed, 12 Feb 2025 09:04:48 -0600
Subject: [PATCH 1/2] Inhibit management of share config.php file when
 mpf_disable_mission_portal_docroot_sync_from_share_gui is defined

In preparation for possibly removing the share/GUI folder entirely.

Ticket: ENT-12658
Changelog: title
---
 cfe_internal/enterprise/CFE_hub_specific.cf | 28 +++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/cfe_internal/enterprise/CFE_hub_specific.cf b/cfe_internal/enterprise/CFE_hub_specific.cf
index 9cfb500dec..7817b76a6f 100644
--- a/cfe_internal/enterprise/CFE_hub_specific.cf
+++ b/cfe_internal/enterprise/CFE_hub_specific.cf
@@ -115,19 +115,21 @@ bundle agent update_cli_rest_server_url_config
     "regex_test_pattern" string => ".*localhost:$(cfe_internal_hub_vars.https_port).*";
 
   files:
-   "$(mp_share_config_file)"
-      edit_line => change_cli_rest_server_url_port,
-      if => and(
-        fileexists("$(mp_share_config_file)"),
-        islessthan(countlinesmatching("$(regex_test_pattern)", "$(mp_share_config_file)"), 1)
-        );
-
-    "$(mp_config_file)"
-      edit_line => change_cli_rest_server_url_port,
-      if => and(
-        fileexists("$(mp_config_file)"),
-        islessthan(countlinesmatching("$(regex_test_pattern)", "$(mp_config_file)"), 1)
-        );
+    !mpf_disable_mission_portal_docroot_sync_from_share_gui::
+      "$(mp_share_config_file)"
+         edit_line => change_cli_rest_server_url_port,
+         if => and(
+           fileexists("$(mp_share_config_file)"),
+           islessthan(countlinesmatching("$(regex_test_pattern)", "$(mp_share_config_file)"), 1)
+           );
+
+    any::
+      "$(mp_config_file)"
+        edit_line => change_cli_rest_server_url_port,
+        if => and(
+          fileexists("$(mp_config_file)"),
+          islessthan(countlinesmatching("$(regex_test_pattern)", "$(mp_config_file)"), 1)
+          );
 }
 
 bundle edit_line change_cli_rest_server_url_port

From 94e503cdcdc7b40c6d91a5d5e993778cb337f9da Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Thu, 13 Feb 2025 12:11:27 -0600
Subject: [PATCH 2/2] bumped upload-artifact github action to v4

https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md

Ticket: none
Changelog: none
(cherry picked from commit c219971cbdf22a0708319010a80d8f4f2d4a2258)
---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ab18a66d9c..8182b01d51 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Prepare Artifacts for Uploading
         run: tar -zcvf /tmp/workspace.tgz ./ && mv /tmp/workspace.tgz ./
       - name: Upload The Workspace as Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: workspace
           path: workspace.tgz