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

Drop os-labels and pull-labels

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-11-18 16:49:22 -07:00 • committed by Daniel Wozniak
parent 521559a423
commit 6e8ce16b24
7 changed files with 17 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,8 +42,6 @@ jobs:
outputs:
jobs: ${{ steps.define-jobs.outputs.jobs }}
changed-files: ${{ steps.process-changed-files.outputs.changed-files }}
os-labels: ${{ steps.get-pull-labels.outputs.os-labels }}
pull-labels: ${{ steps.get-pull-labels.outputs.test-labels }}
testrun: ${{ steps.define-testrun.outputs.testrun }}
salt-version: ${{ steps.setup-salt-version.outputs.salt-version }}
cache-seed: ${{ steps.set-cache-seed.outputs.cache-seed }}
@ -164,14 +162,6 @@ jobs:
salt-version: ""
validate-version: true
- name: Get Pull Request Test Labels
id: get-pull-labels
if: ${{ github.event_name == 'pull_request'}}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
tools ci get-pr-test-labels --repository ${{ github.repository }}
- name: Get Hash For Nox Tarball Cache
id: nox-archive-hash
run: |
@ -1168,7 +1158,7 @@ jobs:
test-pkg-macos-12:
name: macOS 12 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-12'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'macos-12') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-12'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-macos
@ -1190,7 +1180,7 @@ jobs:
test-pkg-macos-13:
name: macOS 13 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-13'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'macos-13') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-13'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-macos
@ -1212,7 +1202,7 @@ jobs:
test-pkg-macos-14:
name: macOS 14 (M1) Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-14'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'macos-14') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-14'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-macos
@ -1234,7 +1224,7 @@ jobs:
test-pkg-macos-15:
name: macOS 15 (M1) Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-15'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'macos-15') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-15'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-macos
@ -1256,7 +1246,7 @@ jobs:
test-pkg-windows-2019-nsis:
name: Windows 2019 NSIS Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-nsis'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'windows-2019') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-nsis'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-windows
@ -1277,7 +1267,7 @@ jobs:
test-pkg-windows-2019-msi:
name: Windows 2019 MSI Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-msi'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'windows-2019') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-msi'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-windows
@ -1298,7 +1288,7 @@ jobs:
test-pkg-windows-2022-nsis:
name: Windows 2022 NSIS Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-nsis'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'windows-2022') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-nsis'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-windows
@ -1319,7 +1309,7 @@ jobs:
test-pkg-windows-2022-msi:
name: Windows 2022 MSI Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-msi'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'windows-2022') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-msi'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-windows
@ -1382,7 +1372,7 @@ jobs:
test-macos-12:
name: macOS 12 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-12'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'macos-12') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-12'] }}
needs:
- prepare-workflow
- build-ci-deps-macos
@ -1404,7 +1394,7 @@ jobs:
test-macos-13:
name: macOS 13 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-13'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'macos-13') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-13'] }}
needs:
- prepare-workflow
- build-ci-deps-macos
@ -1426,7 +1416,7 @@ jobs:
test-macos-14:
name: macOS 14 (M1) Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-14'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'macos-14') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-14'] }}
needs:
- prepare-workflow
- build-ci-deps-macos
@ -1448,7 +1438,7 @@ jobs:
test-macos-15:
name: macOS 15 (M1) Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-15'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'macos-15') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-15'] }}
needs:
- prepare-workflow
- build-ci-deps-macos

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

@ -91,8 +91,6 @@ jobs:
outputs:
jobs: ${{ steps.define-jobs.outputs.jobs }}
changed-files: ${{ steps.process-changed-files.outputs.changed-files }}
os-labels: ${{ steps.get-pull-labels.outputs.os-labels }}
pull-labels: ${{ steps.get-pull-labels.outputs.test-labels }}
testrun: ${{ steps.define-testrun.outputs.testrun }}
salt-version: ${{ steps.setup-salt-version.outputs.salt-version }}
cache-seed: ${{ steps.set-cache-seed.outputs.cache-seed }}
@ -213,14 +211,6 @@ jobs:
salt-version: ""
validate-version: true
- name: Get Pull Request Test Labels
id: get-pull-labels
if: ${{ github.event_name == 'pull_request'}}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
tools ci get-pr-test-labels --repository ${{ github.repository }}
- name: Get Hash For Nox Tarball Cache
id: nox-archive-hash
run: |

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

@ -81,8 +81,6 @@ jobs:
outputs:
jobs: ${{ steps.define-jobs.outputs.jobs }}
changed-files: ${{ steps.process-changed-files.outputs.changed-files }}
os-labels: ${{ steps.get-pull-labels.outputs.os-labels }}
pull-labels: ${{ steps.get-pull-labels.outputs.test-labels }}
testrun: ${{ steps.define-testrun.outputs.testrun }}
salt-version: ${{ steps.setup-salt-version.outputs.salt-version }}
cache-seed: ${{ steps.set-cache-seed.outputs.cache-seed }}
@ -203,14 +201,6 @@ jobs:
salt-version: ""
validate-version: true
- name: Get Pull Request Test Labels
id: get-pull-labels
if: ${{ github.event_name == 'pull_request'}}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
tools ci get-pr-test-labels --repository ${{ github.repository }}
- name: Get Hash For Nox Tarball Cache
id: nox-archive-hash
run: |

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

@ -72,8 +72,6 @@ jobs:
outputs:
jobs: ${{ steps.define-jobs.outputs.jobs }}
changed-files: ${{ steps.process-changed-files.outputs.changed-files }}
os-labels: ${{ steps.get-pull-labels.outputs.os-labels }}
pull-labels: ${{ steps.get-pull-labels.outputs.test-labels }}
testrun: ${{ steps.define-testrun.outputs.testrun }}
salt-version: ${{ steps.setup-salt-version.outputs.salt-version }}
cache-seed: ${{ steps.set-cache-seed.outputs.cache-seed }}
@ -194,14 +192,6 @@ jobs:
salt-version: "${{ inputs.salt-version }}"
validate-version: true
- name: Get Pull Request Test Labels
id: get-pull-labels
if: ${{ github.event_name == 'pull_request'}}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
tools ci get-pr-test-labels --repository ${{ github.repository }}
- name: Get Hash For Nox Tarball Cache
id: nox-archive-hash
run: |

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

@ -90,8 +90,6 @@ jobs:
outputs:
jobs: ${{ steps.define-jobs.outputs.jobs }}
changed-files: ${{ steps.process-changed-files.outputs.changed-files }}
os-labels: ${{ steps.get-pull-labels.outputs.os-labels }}
pull-labels: ${{ steps.get-pull-labels.outputs.test-labels }}
testrun: ${{ steps.define-testrun.outputs.testrun }}
salt-version: ${{ steps.setup-salt-version.outputs.salt-version }}
cache-seed: ${{ steps.set-cache-seed.outputs.cache-seed }}
@ -212,14 +210,6 @@ jobs:
salt-version: "<{ prepare_workflow_salt_version_input }>"
validate-version: true
- name: Get Pull Request Test Labels
id: get-pull-labels
if: ${{ github.event_name == 'pull_request'}}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
tools ci get-pr-test-labels --repository ${{ github.repository }}
- name: Get Hash For Nox Tarball Cache
id: nox-archive-hash
run: |

6
.github/workflows/templates/test-salt-pkg.yml.jinja vendored
View file

@ -7,7 +7,7 @@
<%- if workflow_slug != "ci" or os.slug in mandatory_os_slugs or True %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
<%- else %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), '<{ os.slug }>') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
<%- endif %>
needs:
- prepare-workflow
@ -44,7 +44,7 @@
<%- if workflow_slug != "ci" or os.slug in mandatory_os_slugs %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
<%- else %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), '<{ os.slug }>') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
<%- endif %>
needs:
- prepare-workflow
@ -77,7 +77,7 @@
<%- if workflow_slug != "ci" or os.slug in mandatory_os_slugs %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
<%- else %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), '<{ os.slug }>') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
<%- endif %>
needs:
- prepare-workflow

4
.github/workflows/templates/test-salt.yml.jinja vendored
View file

@ -43,7 +43,7 @@
<%- if workflow_slug != "ci" or os.slug in mandatory_os_slugs %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{os.job_name}>'] }}
<%- else %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{os.job_name}>'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), '<{ os.slug }>') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{os.job_name}>'] }}
<%- endif %>
needs:
- prepare-workflow
@ -75,7 +75,7 @@
<%- if workflow_slug != "ci" or os.slug in mandatory_os_slugs or True%>
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
<%- else %>
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), '<{ os.slug }>') }}
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
<%- endif %>
needs:
- prepare-workflow