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

Tie windows installer action into ci.yml

Browse source
This commit is contained in:
Shane Lee 2024-07-16 11:09:28 -06:00 • committed by Daniel Wozniak
parent 64ef4b1349
commit 853f1441ad
8 changed files with 68 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,6 +134,9 @@ 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
@ -245,6 +248,12 @@ 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
@ -441,6 +450,7 @@ 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 }}"
@ -455,6 +465,7 @@ 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 }}"
@ -2130,6 +2141,7 @@ jobs:
needs:
- prepare-workflow
- pre-commit
- windows-installer-check
- lint
- build-docs
- build-deps-onedir

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

@ -183,6 +183,9 @@ 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
@ -294,6 +297,12 @@ 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
@ -495,6 +504,7 @@ 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 }}"
@ -513,6 +523,7 @@ 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 }}"
@ -3025,6 +3036,7 @@ 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,6 +173,9 @@ 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
@ -284,6 +287,12 @@ 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
@ -480,6 +489,7 @@ 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 }}"
@ -494,6 +504,7 @@ 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 }}"
@ -2171,6 +2182,7 @@ 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,6 +164,9 @@ 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
@ -284,6 +287,12 @@ 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
@ -480,6 +489,7 @@ 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 }}"
@ -498,6 +508,7 @@ 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 }}"
@ -3028,6 +3039,7 @@ 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,6 +10,7 @@
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,6 +23,18 @@
<%- 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,6 +182,9 @@ 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/test-installer-action-windows.yml → .github/workflows/windows-installer-action.yml vendored
View file

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