Merge branch 'salt-key-D-error' of github.com:bertdawg76/salt into salt-key-D-error

Author: bertdawg76

.github/workflows/ci.yml

@@ -5,7 +5,11 @@ name: CI
 run-name: "CI (${{ github.event_name == 'pull_request' && format('pr: #{0}', github.event.number) || format('{0}: {1}', startsWith(github.event.ref, 'refs/tags') && 'tag' || 'branch', github.ref_name) }})"
 
 on:
-  push: {}
+  push:
+    branches:
+      - 3006.x
+      - 3007.x
+      - master
   pull_request:
     types:
       - labeled

.github/workflows/templates/layout.yml.jinja

@@ -19,7 +19,11 @@ run-name: "<{ workflow_name }> (${{ github.event_name == 'pull_request' && forma
 <%- block on %>
 
 on:
-  push: {}
+  push:
+    branches:
+      - 3006.x
+      - 3007.x
+      - master
   pull_request:
     types:
       - labeled

pkg/windows/nsis/build_pkg.ps1

@@ -436,6 +436,8 @@ if ( Test-Path -Path "$INSTALLER_DIR\$installer_name" ) {
 } else {
     Write-Result "Failed" -ForegroundColor Red
     Write-Host "Failed to find $installer_name in installer directory"
+    Write-Host "CMD:"
+    Write-Host "`"$NSIS_BIN`" /DSaltVersion=$Version /DPythonArchitecture=$ARCH /DEstimatedSize=$estimated_size `"$INSTALLER_DIR\Salt-Minion-Setup.nsi`""
     exit 1
 }
 

pkg/windows/nsis/installer/Salt-Minion-Setup.nsi

@@ -7,46 +7,56 @@
 # Written by kenglish_hi
 # Adapted from StrReplace written by dandaman32
 #------------------------------------------------------------------------------
+
+# Initialize variables
+Var /GLOBAL STR_HAYSTACK
+Var /GLOBAL STR_NEEDLE
+Var /GLOBAL STR_CONTAINS_VAR_1
+Var /GLOBAL STR_CONTAINS_VAR_2
+Var /GLOBAL STR_CONTAINS_VAR_3
+Var /GLOBAL STR_CONTAINS_VAR_4
+Var /GLOBAL STR_RETURN_VAR
+
 !define StrContains "!insertmacro StrContains"
 !macro StrContains OUT NEEDLE HAYSTACK
     Push "${HAYSTACK}"
     Push "${NEEDLE}"
-    Call StrContains
+    !ifdef __UNINSTALL__
+        Call un.StrContains
+    !else
+        Call StrContains
+    !endif
     Pop  "${OUT}"
 !macroend
-Function StrContains
 
-    # Initialize variables
-    Var /GLOBAL STR_HAYSTACK
-    Var /GLOBAL STR_NEEDLE
-    Var /GLOBAL STR_CONTAINS_VAR_1
-    Var /GLOBAL STR_CONTAINS_VAR_2
-    Var /GLOBAL STR_CONTAINS_VAR_3
-    Var /GLOBAL STR_CONTAINS_VAR_4
-    Var /GLOBAL STR_RETURN_VAR
+!macro Func_StrContains un
+    Function ${un}StrContains
 
-    Exch $STR_NEEDLE
-    Exch 1
-    Exch $STR_HAYSTACK
-    # Uncomment to debug
-    #MessageBox MB_OK 'STR_NEEDLE = $STR_NEEDLE STR_HAYSTACK = $STR_HAYSTACK '
-    StrCpy $STR_RETURN_VAR ""
-    StrCpy $STR_CONTAINS_VAR_1 -1
-    StrLen $STR_CONTAINS_VAR_2 $STR_NEEDLE
-    StrLen $STR_CONTAINS_VAR_4 $STR_HAYSTACK
+        Exch $STR_NEEDLE
+        Exch 1
+        Exch $STR_HAYSTACK
+        # Uncomment to debug
+        #MessageBox MB_OK 'STR_NEEDLE = $STR_NEEDLE$\nSTR_HAYSTACK = $STR_HAYSTACK'
+        StrCpy $STR_RETURN_VAR ""
+        StrCpy $STR_CONTAINS_VAR_1 -1
+        StrLen $STR_CONTAINS_VAR_2 $STR_NEEDLE
+        StrLen $STR_CONTAINS_VAR_4 $STR_HAYSTACK
 
-    loop:
-        IntOp $STR_CONTAINS_VAR_1 $STR_CONTAINS_VAR_1 + 1
-        StrCpy $STR_CONTAINS_VAR_3 $STR_HAYSTACK $STR_CONTAINS_VAR_2 $STR_CONTAINS_VAR_1
-        StrCmp $STR_CONTAINS_VAR_3 $STR_NEEDLE found
-        StrCmp $STR_CONTAINS_VAR_1 $STR_CONTAINS_VAR_4 done
-        Goto loop
+        loop:
+            IntOp $STR_CONTAINS_VAR_1 $STR_CONTAINS_VAR_1 + 1
+            StrCpy $STR_CONTAINS_VAR_3 $STR_HAYSTACK $STR_CONTAINS_VAR_2 $STR_CONTAINS_VAR_1
+            StrCmp $STR_CONTAINS_VAR_3 $STR_NEEDLE found
+            StrCmp $STR_CONTAINS_VAR_1 $STR_CONTAINS_VAR_4 done
+            Goto loop
 
-    found:
-        StrCpy $STR_RETURN_VAR $STR_NEEDLE
-        Goto done
+        found:
+            StrCpy $STR_RETURN_VAR $STR_NEEDLE
+            Goto done
 
-    done:
-        Pop $STR_NEEDLE  # Prevent "invalid opcode" errors and keep the stack clean
-        Exch $STR_RETURN_VAR
-FunctionEnd
+        done:
+            Pop $STR_NEEDLE  # Prevent "invalid opcode" errors and keep the stack clean
+            Exch $STR_RETURN_VAR
+    FunctionEnd
+!macroend
+!insertmacro Func_StrContains ""
+!insertmacro Func_StrContains "un."

pkg/windows/nsis/installer/helper_StrContains.nsh

@@ -709,7 +709,7 @@ def workflow_config(
     gh_event: dict[str, Any] = {}
     config: dict[str, Any] = {}
     labels: list[tuple[str, str]] = []
-    slugs: list[str] = []
+    slugs: str | list[str] = []
 
     ctx.info(f"{'==== environment ====':^80s}")
     ctx.info(f"{pprint.pformat(dict(os.environ))}")
@@ -746,17 +746,19 @@ def workflow_config(
 
     if event_name != "pull_request" or "test:full" in [_[0] for _ in labels]:
         full = True
-        requested_slugs = _environment_slugs(
-            ctx,
-            tools.utils.get_cicd_shared_context()["full-testrun-slugs"],
-            labels,
-        )
+        slugs = os.environ.get("FULL_TESTRUN_SLUGS", "")
+        if not slugs:
+            slugs = tools.utils.get_cicd_shared_context()["full-testrun-slugs"]
     else:
-        requested_slugs = _environment_slugs(
-            ctx,
-            tools.utils.get_cicd_shared_context()["pr-testrun-slugs"],
-            labels,
-        )
+        slugs = os.environ.get("PR_TESTRUN_SLUGS", "")
+        if not slugs:
+            slugs = tools.utils.get_cicd_shared_context()["pr-testrun-slugs"]
+
+    requested_slugs = _environment_slugs(
+        ctx,
+        slugs,
+        labels,
+    )
 
     ctx.info(f"{'==== requested slugs ====':^80s}")
     ctx.info(f"{pprint.pformat(requested_slugs)}")