From fb2297e11cd714fe5911e5d00916a00be56d566b Mon Sep 17 00:00:00 2001 From: twangboy Date: Wed, 4 Sep 2024 10:45:19 -0600 Subject: [PATCH] Update workflows --- .github/workflows/ci.yml | 12 ++++ .github/workflows/nightly.yml | 12 ++++ .github/workflows/nsis-tests.yml | 66 +++++++++++++++++++ .github/workflows/scheduled.yml | 12 ++++ .github/workflows/staging.yml | 12 ++++ .github/workflows/templates/ci.yml.jinja | 6 +- .github/workflows/templates/layout.yml.jinja | 3 + .../test-installer-action-windows.yml | 42 ------------ 8 files changed, 120 insertions(+), 45 deletions(-) create mode 100644 .github/workflows/nsis-tests.yml delete mode 100644 .github/workflows/test-installer-action-windows.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20769929078..0b6de9cff23 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 93c4c09f55e..18e390d8ab7 100644 --- a/.github/workflows/nightly.yml +++ b/.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 diff --git a/.github/workflows/nsis-tests.yml b/.github/workflows/nsis-tests.yml new file mode 100644 index 00000000000..958f3a25303 --- /dev/null +++ b/.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 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 2ab7dc11b6d..767b8c17f46 100644 --- a/.github/workflows/scheduled.yml +++ b/.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 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 616582c55ec..2cf7786fe2c 100644 --- a/.github/workflows/staging.yml +++ b/.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 diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 01b2fadc210..91713863f18 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.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: diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index 0f0e795c0c6..2259e26bff4 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.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 diff --git a/.github/workflows/test-installer-action-windows.yml b/.github/workflows/test-installer-action-windows.yml deleted file mode 100644 index e3f91661f05..00000000000 --- a/.github/workflows/test-installer-action-windows.yml +++ /dev/null @@ -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