saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert windows installer check change

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-07-22 17:55:34 -07:00 • committed by Daniel Wozniak
parent 68d18b2ad3
commit 137a6b7119
8 changed files with 6 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View file

@ -134,9 +134,6 @@ jobs:
- *salt_added_modified
- *tests_added_modified
- *pkg_tests_added_modified
windows-installer:
- added|modified:
- pkg/windows/**
- name: Set up Python 3.10
uses: actions/setup-python@v5
@ -248,12 +245,6 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
pre-commit-version: "3.0.4"
windows-installer-check:
name: Windows Installer Check
if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] && fromJSON(needs.prepare-workflow.outputs.changed-files)['windows-installer'] }}
uses: ./.github/workflows/windows-installer-action.yml
needs:
- prepare-workflow
lint:
name: Lint
@ -450,7 +441,6 @@ jobs:
needs:
- prepare-workflow
- build-salt-onedir
- windows-installer-check
uses: ./.github/workflows/build-packages.yml
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -465,7 +455,6 @@ jobs:
needs:
- prepare-workflow
- build-salt-onedir
- windows-installer-check
uses: ./.github/workflows/build-packages.yml
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -2141,7 +2130,6 @@ jobs:
needs:
- prepare-workflow
- pre-commit
- windows-installer-check
- lint
- build-docs
- build-deps-onedir

12
.github/workflows/nightly.yml vendored
View file

@ -183,9 +183,6 @@ jobs:
- *salt_added_modified
- *tests_added_modified
- *pkg_tests_added_modified
windows-installer:
- added|modified:
- pkg/windows/**
- name: Set up Python 3.10
uses: actions/setup-python@v5
@ -297,12 +294,6 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
pre-commit-version: "3.0.4"
windows-installer-check:
name: Windows Installer Check
if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] && fromJSON(needs.prepare-workflow.outputs.changed-files)['windows-installer'] }}
uses: ./.github/workflows/windows-installer-action.yml
needs:
- prepare-workflow
lint:
name: Lint
@ -504,7 +495,6 @@ jobs:
needs:
- prepare-workflow
- build-salt-onedir
- windows-installer-check
uses: ./.github/workflows/build-packages.yml
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -523,7 +513,6 @@ jobs:
needs:
- prepare-workflow
- build-salt-onedir
- windows-installer-check
uses: ./.github/workflows/build-packages.yml
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -3036,7 +3025,6 @@ jobs:
- trigger-branch-nightly-builds
- prepare-workflow
- pre-commit
- windows-installer-check
- lint
- build-docs
- build-deps-onedir

12
.github/workflows/scheduled.yml vendored
View file

@ -173,9 +173,6 @@ jobs:
- *salt_added_modified
- *tests_added_modified
- *pkg_tests_added_modified
windows-installer:
- added|modified:
- pkg/windows/**
- name: Set up Python 3.10
uses: actions/setup-python@v5
@ -287,12 +284,6 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
pre-commit-version: "3.0.4"
windows-installer-check:
name: Windows Installer Check
if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] && fromJSON(needs.prepare-workflow.outputs.changed-files)['windows-installer'] }}
uses: ./.github/workflows/windows-installer-action.yml
needs:
- prepare-workflow
lint:
name: Lint
@ -489,7 +480,6 @@ jobs:
needs:
- prepare-workflow
- build-salt-onedir
- windows-installer-check
uses: ./.github/workflows/build-packages.yml
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -504,7 +494,6 @@ jobs:
needs:
- prepare-workflow
- build-salt-onedir
- windows-installer-check
uses: ./.github/workflows/build-packages.yml
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -2182,7 +2171,6 @@ jobs:
- trigger-branch-scheduled-builds
- prepare-workflow
- pre-commit
- windows-installer-check
- lint
- build-docs
- build-deps-onedir

12
.github/workflows/staging.yml vendored
View file

@ -164,9 +164,6 @@ jobs:
- *salt_added_modified
- *tests_added_modified
- *pkg_tests_added_modified
windows-installer:
- added|modified:
- pkg/windows/**
- name: Set up Python 3.10
uses: actions/setup-python@v5
@ -287,12 +284,6 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
changed-files: ${{ needs.prepare-workflow.outputs.changed-files }}
pre-commit-version: "3.0.4"
windows-installer-check:
name: Windows Installer Check
if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] && fromJSON(needs.prepare-workflow.outputs.changed-files)['windows-installer'] }}
uses: ./.github/workflows/windows-installer-action.yml
needs:
- prepare-workflow
lint:
name: Lint
@ -489,7 +480,6 @@ jobs:
needs:
- prepare-workflow
- build-salt-onedir
- windows-installer-check
uses: ./.github/workflows/build-packages.yml
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -508,7 +498,6 @@ jobs:
needs:
- prepare-workflow
- build-salt-onedir
- windows-installer-check
uses: ./.github/workflows/build-packages.yml
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@ -3039,7 +3028,6 @@ jobs:
- check-requirements
- prepare-workflow
- pre-commit
- windows-installer-check
- lint
- build-docs
- build-deps-onedir

1
.github/workflows/templates/build-packages.yml.jinja vendored
View file

@ -10,7 +10,6 @@
needs:
- prepare-workflow
- build-salt-onedir
- windows-installer-check
uses: ./.github/workflows/build-packages.yml
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"

12
.github/workflows/templates/ci.yml.jinja vendored
View file

@ -23,18 +23,6 @@
<%- endif %>
<%- set job_name = "windows-installer-check" %>
<%- if includes.get(job_name, True) %>
<{ job_name }>:
<%- do conclusion_needs.append(job_name) %>
name: Windows Installer Check
if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] && fromJSON(needs.prepare-workflow.outputs.changed-files)['windows-installer'] }}
uses: ./.github/workflows/windows-installer-action.yml
needs:
- prepare-workflow
<%- endif %>
<%- set job_name = "lint" %>
<%- if includes.get(job_name, True) %>

3
.github/workflows/templates/layout.yml.jinja vendored
View file

@ -182,9 +182,6 @@ jobs:
- *salt_added_modified
- *tests_added_modified
- *pkg_tests_added_modified
windows-installer:
- added|modified:
- pkg/windows/**
- name: Set up Python 3.10
uses: actions/setup-python@v5

10
.github/workflows/windows-installer-action.yml → .github/workflows/test-installer-action-windows.yml vendored
View file

@ -1,11 +1,13 @@
---
name: Windows Installer Check
name: Test Windows Installer
on: workflow_call
on: pull_request
permissions:
contents: read
jobs:
windows-installer-check:
name: Windows Installer Check
Test-Windows-Installer:
runs-on:
- windows-latest