Update workflows

.github/workflows/ci.yml

@@ -127,6 +127,9 @@ jobs:
                 - pkg/**
                 - *pkg_requirements
                 - *salt_added_modified
+            nsis_tests:
+              - added|modified: &nsis_tests
+                - pkg/windows/nsis/**
             testrun:
               - added|modified:
                 - *pkg_requirements
@@ -254,6 +257,14 @@ jobs:
       - prepare-workflow
     with:
       changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
+  nsis-tests:
+    name: NSIS Tests
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    uses: ./.github/workflows/nsis-tests.yml
+    needs:
+      - prepare-workflow
+    with:
+      changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
 
   prepare-release:
     name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -2131,6 +2142,7 @@ jobs:
       - prepare-workflow
       - pre-commit
       - lint
+      - nsis-tests
       - build-docs
       - build-deps-onedir
       - build-salt-onedir

.github/workflows/nightly.yml

@@ -176,6 +176,9 @@ jobs:
                 - pkg/**
                 - *pkg_requirements
                 - *salt_added_modified
+            nsis_tests:
+              - added|modified: &nsis_tests
+                - pkg/windows/nsis/**
             testrun:
               - added|modified:
                 - *pkg_requirements
@@ -303,6 +306,14 @@ jobs:
       - prepare-workflow
     with:
       changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
+  nsis-tests:
+    name: NSIS Tests
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    uses: ./.github/workflows/nsis-tests.yml
+    needs:
+      - prepare-workflow
+    with:
+      changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
 
   prepare-release:
     name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -3026,6 +3037,7 @@ jobs:
       - prepare-workflow
       - pre-commit
       - lint
+      - nsis-tests
       - build-docs
       - build-deps-onedir
       - build-salt-onedir

.github/workflows/nsis-tests.yml

@@ -0,0 +1,66 @@
+---
+name: Test NSIS Installer
+
+on:
+  workflow_call:
+    inputs:
+      changed-files:
+        required: true
+        type: string
+        description: JSON string containing information about changed files
+
+jobs:
+  Test-NSIS-Logic:
+    name: Logic Tests
+    runs-on:
+      - windows-latest
+
+    steps:
+
+    - name: Checkout Salt
+      uses: actions/checkout@v4
+
+    - name: Set Up Python 3.10
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.10"
+
+    - name: Install NSIS
+      run: .\pkg\windows\install_nsis.cmd -CICD
+      shell: cmd
+
+    - name: Build Test Installer
+      run: .\pkg\windows\nsis\tests\setup.cmd -CICD
+      shell: cmd
+
+    - name: Run Config Tests
+      run: .\pkg\windows\nsis\tests\test.cmd -CICD .\config_tests
+      shell: cmd
+
+  Test-NSIS-Stress:
+    name: Stress Tests
+    runs-on:
+      - windows-latest
+    if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['nsis_tests'] }}
+
+    steps:
+
+      - name: Checkout Salt
+        uses: actions/checkout@v4
+
+      - name: Set Up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install NSIS
+        run: .\pkg\windows\install_nsis.cmd -CICD
+        shell: cmd
+
+      - name: Build Test Installer
+        run: .\pkg\windows\nsis\tests\setup.cmd -CICD
+        shell: cmd
+
+      - name: Run Stress Test
+        run: .\pkg\windows\nsis\tests\test.cmd -CICD .\stress_tests
+        shell: cmd

.github/workflows/scheduled.yml

@@ -166,6 +166,9 @@ jobs:
                 - pkg/**
                 - *pkg_requirements
                 - *salt_added_modified
+            nsis_tests:
+              - added|modified: &nsis_tests
+                - pkg/windows/nsis/**
             testrun:
               - added|modified:
                 - *pkg_requirements
@@ -293,6 +296,14 @@ jobs:
       - prepare-workflow
     with:
       changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
+  nsis-tests:
+    name: NSIS Tests
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    uses: ./.github/workflows/nsis-tests.yml
+    needs:
+      - prepare-workflow
+    with:
+      changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
 
   prepare-release:
     name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -2172,6 +2183,7 @@ jobs:
       - prepare-workflow
       - pre-commit
       - lint
+      - nsis-tests
       - build-docs
       - build-deps-onedir
       - build-salt-onedir

.github/workflows/staging.yml

@@ -157,6 +157,9 @@ jobs:
                 - pkg/**
                 - *pkg_requirements
                 - *salt_added_modified
+            nsis_tests:
+              - added|modified: &nsis_tests
+                - pkg/windows/nsis/**
             testrun:
               - added|modified:
                 - *pkg_requirements
@@ -293,6 +296,14 @@ jobs:
       - prepare-workflow
     with:
       changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
+  nsis-tests:
+    name: NSIS Tests
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    uses: ./.github/workflows/nsis-tests.yml
+    needs:
+      - prepare-workflow
+    with:
+      changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
 
   prepare-release:
     name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -3023,6 +3034,7 @@ jobs:
       - prepare-workflow
       - pre-commit
       - lint
+      - nsis-tests
       - build-docs
       - build-deps-onedir
       - build-salt-onedir

.github/workflows/templates/ci.yml.jinja

@@ -39,13 +39,13 @@
 
   <%- endif %>
 
-  <%- set job_name = "test-windows-installer" %>
+  <%- set job_name = "nsis-tests" %>
   <%- if includes.get(job_name, True) %>
   <{ job_name }>:
     <%- do conclusion_needs.append(job_name) %>
-    name: Installer
+    name: NSIS Tests
     if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-    uses: ./.github/workflows/test-installer-action-windows.yml
+    uses: ./.github/workflows/nsis-tests.yml
     needs:
       - prepare-workflow
     with:

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

@@ -175,6 +175,9 @@ jobs:
                 - pkg/**
                 - *pkg_requirements
                 - *salt_added_modified
+            nsis_tests:
+              - added|modified: &nsis_tests
+                - pkg/windows/nsis/**
             testrun:
               - added|modified:
                 - *pkg_requirements

.github/workflows/test-installer-action-windows.yml

@@ -1,42 +0,0 @@
----
-name: Test Windows Installer
-
-on:
-  workflow_call:
-    inputs:
-      changed-files:
-        required: true
-        type: string
-        description: JSON string containing information about changed files
-
-jobs:
-  Test-Windows-Installer:
-    name: Test Windows Installer logic
-    runs-on:
-      - windows-latest
-
-    steps:
-
-    - name: Checkout Salt
-      uses: actions/checkout@v4
-
-    - name: Set Up Python 3.10
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.10"
-
-    - name: Install NSIS
-      run: .\pkg\windows\install_nsis.cmd -CICD
-      shell: cmd
-
-    - name: Build Test Installer
-      run: .\pkg\windows\nsis\tests\setup.cmd -CICD
-      shell: cmd
-
-    - name: Run Stress Test
-      run: .\pkg\windows\nsis\tests\test.cmd -CICD .\stress_tests
-      shell: cmd
-
-    - name: Run Config Tests
-      run: .\pkg\windows\nsis\tests\test.cmd -CICD .\config_tests
-      shell: cmd