Skip to content

Commit 77725b7

Browse files
avances123avances123
authored
Merge branch 'master' into master
2 parents 2c88d4f + db5a9a1 commit 77725b7

25 files changed

Lines changed: 768 additions & 214 deletions

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
latest-release: ${{ steps.get-salt-releases.outputs.latest-release }}
4848
releases: ${{ steps.get-salt-releases.outputs.releases }}
4949
release-changelog-target: ${{ steps.get-release-changelog-target.outputs.release-changelog-target }}
50+
testing-releases: ${{ steps.get-testing-releases.outputs.testing-releases }}
5051
steps:
5152
- uses: actions/checkout@v3
5253
with:
@@ -199,10 +200,18 @@ jobs:
199200
run: |
200201
tools ci get-releases
201202
203+
- name: Get Latest Salt Releases for Testing
204+
id: get-testing-releases
205+
env:
206+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
207+
run: |
208+
tools ci get-testing-releases ${{ join(fromJSON(steps.get-salt-releases.outputs.releases), ' ') }} --salt-version ${{ steps.setup-salt-version.outputs.salt-version }}
209+
202210
- name: Check Salt Releases
203211
run: |
204212
echo '${{ steps.get-salt-releases.outputs.latest-release }}' | jq -C '.'
205213
echo '${{ steps.get-salt-releases.outputs.releases }}' | jq -C '.'
214+
echo '${{ steps.get-testing-releases.outputs.testing-releases }}' | jq -C '.'
206215
207216
- name: Define Testrun
208217
id: define-testrun
@@ -537,6 +546,7 @@ jobs:
537546
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
538547
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
539548
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
549+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
540550

541551
centos-7-pkg-tests:
542552
name: CentOS 7 Package Tests
@@ -554,6 +564,7 @@ jobs:
554564
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
555565
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
556566
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
567+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
557568

558569
centosstream-8-pkg-tests:
559570
name: CentOS Stream 8 Package Tests
@@ -571,6 +582,7 @@ jobs:
571582
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
572583
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
573584
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
585+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
574586

575587
centosstream-9-pkg-tests:
576588
name: CentOS Stream 9 Package Tests
@@ -588,6 +600,7 @@ jobs:
588600
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
589601
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
590602
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
603+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
591604

592605
debian-10-pkg-tests:
593606
name: Debian 10 Package Tests
@@ -605,6 +618,7 @@ jobs:
605618
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
606619
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
607620
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
621+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
608622

609623
debian-11-pkg-tests:
610624
name: Debian 11 Package Tests
@@ -622,6 +636,7 @@ jobs:
622636
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
623637
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
624638
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
639+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
625640

626641
debian-11-arm64-pkg-tests:
627642
name: Debian 11 Arm64 Package Tests
@@ -639,6 +654,7 @@ jobs:
639654
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
640655
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
641656
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
657+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
642658

643659
photonos-3-pkg-tests:
644660
name: Photon OS 3 Package Tests
@@ -656,6 +672,7 @@ jobs:
656672
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
657673
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
658674
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
675+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
659676

660677
photonos-4-pkg-tests:
661678
name: Photon OS 4 Package Tests
@@ -673,6 +690,7 @@ jobs:
673690
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
674691
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
675692
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
693+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
676694

677695
ubuntu-2004-pkg-tests:
678696
name: Ubuntu 20.04 Package Tests
@@ -690,6 +708,7 @@ jobs:
690708
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
691709
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
692710
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
711+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
693712

694713
ubuntu-2004-arm64-pkg-tests:
695714
name: Ubuntu 20.04 Arm64 Package Tests
@@ -707,6 +726,7 @@ jobs:
707726
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
708727
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
709728
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
729+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
710730

711731
ubuntu-2204-pkg-tests:
712732
name: Ubuntu 22.04 Package Tests
@@ -724,6 +744,7 @@ jobs:
724744
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
725745
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
726746
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
747+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
727748

728749
ubuntu-2204-arm64-pkg-tests:
729750
name: Ubuntu 22.04 Arm64 Package Tests
@@ -741,6 +762,7 @@ jobs:
741762
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
742763
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
743764
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
765+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
744766

745767
macos-12-pkg-tests:
746768
name: macOS 12 Package Tests
@@ -758,6 +780,7 @@ jobs:
758780
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
759781
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
760782
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
783+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
761784

762785
windows-2016-nsis-pkg-tests:
763786
name: Windows 2016 NSIS Package Tests
@@ -775,6 +798,7 @@ jobs:
775798
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
776799
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
777800
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
801+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
778802

779803
windows-2016-msi-pkg-tests:
780804
name: Windows 2016 MSI Package Tests
@@ -792,6 +816,7 @@ jobs:
792816
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
793817
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
794818
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
819+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
795820

796821
windows-2019-nsis-pkg-tests:
797822
name: Windows 2019 NSIS Package Tests
@@ -809,6 +834,7 @@ jobs:
809834
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
810835
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
811836
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
837+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
812838

813839
windows-2019-msi-pkg-tests:
814840
name: Windows 2019 MSI Package Tests
@@ -826,6 +852,7 @@ jobs:
826852
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
827853
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
828854
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
855+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
829856

830857
windows-2022-nsis-pkg-tests:
831858
name: Windows 2022 NSIS Package Tests
@@ -843,6 +870,7 @@ jobs:
843870
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
844871
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
845872
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
873+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
846874

847875
windows-2022-msi-pkg-tests:
848876
name: Windows 2022 MSI Package Tests
@@ -860,6 +888,7 @@ jobs:
860888
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
861889
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
862890
skip-junit-reports: ${{ github.event_name == 'pull_request' }}
891+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
863892

864893
windows-2016:
865894
name: Windows 2016

‎.github/workflows/nightly.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
latest-release: ${{ steps.get-salt-releases.outputs.latest-release }}
9494
releases: ${{ steps.get-salt-releases.outputs.releases }}
9595
release-changelog-target: ${{ steps.get-release-changelog-target.outputs.release-changelog-target }}
96+
testing-releases: ${{ steps.get-testing-releases.outputs.testing-releases }}
9697
steps:
9798
- uses: actions/checkout@v3
9899
with:
@@ -245,10 +246,18 @@ jobs:
245246
run: |
246247
tools ci get-releases
247248
249+
- name: Get Latest Salt Releases for Testing
250+
id: get-testing-releases
251+
env:
252+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
253+
run: |
254+
tools ci get-testing-releases ${{ join(fromJSON(steps.get-salt-releases.outputs.releases), ' ') }} --salt-version ${{ steps.setup-salt-version.outputs.salt-version }}
255+
248256
- name: Check Salt Releases
249257
run: |
250258
echo '${{ steps.get-salt-releases.outputs.latest-release }}' | jq -C '.'
251259
echo '${{ steps.get-salt-releases.outputs.releases }}' | jq -C '.'
260+
echo '${{ steps.get-testing-releases.outputs.testing-releases }}' | jq -C '.'
252261
253262
- name: Define Testrun
254263
id: define-testrun
@@ -589,6 +598,7 @@ jobs:
589598
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
590599
skip-code-coverage: false
591600
skip-junit-reports: false
601+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
592602

593603
centos-7-pkg-tests:
594604
name: CentOS 7 Package Tests
@@ -606,6 +616,7 @@ jobs:
606616
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
607617
skip-code-coverage: false
608618
skip-junit-reports: false
619+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
609620

610621
centosstream-8-pkg-tests:
611622
name: CentOS Stream 8 Package Tests
@@ -623,6 +634,7 @@ jobs:
623634
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
624635
skip-code-coverage: false
625636
skip-junit-reports: false
637+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
626638

627639
centosstream-9-pkg-tests:
628640
name: CentOS Stream 9 Package Tests
@@ -640,6 +652,7 @@ jobs:
640652
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
641653
skip-code-coverage: false
642654
skip-junit-reports: false
655+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
643656

644657
debian-10-pkg-tests:
645658
name: Debian 10 Package Tests
@@ -657,6 +670,7 @@ jobs:
657670
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
658671
skip-code-coverage: false
659672
skip-junit-reports: false
673+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
660674

661675
debian-11-pkg-tests:
662676
name: Debian 11 Package Tests
@@ -674,6 +688,7 @@ jobs:
674688
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
675689
skip-code-coverage: false
676690
skip-junit-reports: false
691+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
677692

678693
debian-11-arm64-pkg-tests:
679694
name: Debian 11 Arm64 Package Tests
@@ -691,6 +706,7 @@ jobs:
691706
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
692707
skip-code-coverage: false
693708
skip-junit-reports: false
709+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
694710

695711
photonos-3-pkg-tests:
696712
name: Photon OS 3 Package Tests
@@ -708,6 +724,7 @@ jobs:
708724
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
709725
skip-code-coverage: false
710726
skip-junit-reports: false
727+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
711728

712729
photonos-4-pkg-tests:
713730
name: Photon OS 4 Package Tests
@@ -725,6 +742,7 @@ jobs:
725742
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
726743
skip-code-coverage: false
727744
skip-junit-reports: false
745+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
728746

729747
ubuntu-2004-pkg-tests:
730748
name: Ubuntu 20.04 Package Tests
@@ -742,6 +760,7 @@ jobs:
742760
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
743761
skip-code-coverage: false
744762
skip-junit-reports: false
763+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
745764

746765
ubuntu-2004-arm64-pkg-tests:
747766
name: Ubuntu 20.04 Arm64 Package Tests
@@ -759,6 +778,7 @@ jobs:
759778
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
760779
skip-code-coverage: false
761780
skip-junit-reports: false
781+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
762782

763783
ubuntu-2204-pkg-tests:
764784
name: Ubuntu 22.04 Package Tests
@@ -776,6 +796,7 @@ jobs:
776796
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
777797
skip-code-coverage: false
778798
skip-junit-reports: false
799+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
779800

780801
ubuntu-2204-arm64-pkg-tests:
781802
name: Ubuntu 22.04 Arm64 Package Tests
@@ -793,6 +814,7 @@ jobs:
793814
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
794815
skip-code-coverage: false
795816
skip-junit-reports: false
817+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
796818

797819
macos-12-pkg-tests:
798820
name: macOS 12 Package Tests
@@ -810,6 +832,7 @@ jobs:
810832
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
811833
skip-code-coverage: false
812834
skip-junit-reports: false
835+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
813836

814837
windows-2016-nsis-pkg-tests:
815838
name: Windows 2016 NSIS Package Tests
@@ -827,6 +850,7 @@ jobs:
827850
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
828851
skip-code-coverage: false
829852
skip-junit-reports: false
853+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
830854

831855
windows-2016-msi-pkg-tests:
832856
name: Windows 2016 MSI Package Tests
@@ -844,6 +868,7 @@ jobs:
844868
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
845869
skip-code-coverage: false
846870
skip-junit-reports: false
871+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
847872

848873
windows-2019-nsis-pkg-tests:
849874
name: Windows 2019 NSIS Package Tests
@@ -861,6 +886,7 @@ jobs:
861886
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
862887
skip-code-coverage: false
863888
skip-junit-reports: false
889+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
864890

865891
windows-2019-msi-pkg-tests:
866892
name: Windows 2019 MSI Package Tests
@@ -878,6 +904,7 @@ jobs:
878904
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
879905
skip-code-coverage: false
880906
skip-junit-reports: false
907+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
881908

882909
windows-2022-nsis-pkg-tests:
883910
name: Windows 2022 NSIS Package Tests
@@ -895,6 +922,7 @@ jobs:
895922
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
896923
skip-code-coverage: false
897924
skip-junit-reports: false
925+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
898926

899927
windows-2022-msi-pkg-tests:
900928
name: Windows 2022 MSI Package Tests
@@ -912,6 +940,7 @@ jobs:
912940
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.3
913941
skip-code-coverage: false
914942
skip-junit-reports: false
943+
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
915944

916945
windows-2016:
917946
name: Windows 2016

0 commit comments

Comments
 (0)