From 4f790e39451681e0d9838999969b470f87d9b6a0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 10 Nov 2023 14:05:41 +0000 Subject: [PATCH] Add `macos-13` to the platforms to run tests on Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 66 +++++++++++++++++++ .github/workflows/nightly.yml | 66 +++++++++++++++++++ .github/workflows/release.yml | 18 +++++ .github/workflows/scheduled.yml | 66 +++++++++++++++++++ .github/workflows/staging.yml | 65 ++++++++++++++++++ .../test-package-downloads-action.yml | 5 +- tools/pre_commit.py | 27 +++++--- 7 files changed, 302 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9fb055ede4..1e387d3940e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -716,6 +716,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + macos-13-ci-deps: + name: macOS 13 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-macos + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + almalinux-8-ci-deps: name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1717,6 +1734,28 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + macos-13-pkg-tests: + name: macOS 13 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-macos-pkgs-onedir + - macos-13-ci-deps + uses: ./.github/workflows/test-packages-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: macos + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + windows-2016-nsis-pkg-tests: name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1937,6 +1976,28 @@ jobs: workflow-slug: ci default-timeout: 180 + macos-13: + name: macOS 13 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - macos-13-ci-deps + uses: ./.github/workflows/test-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + workflow-slug: ci + default-timeout: 180 + almalinux-8: name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2497,6 +2558,7 @@ jobs: - windows-2019-ci-deps - windows-2022-ci-deps - macos-12-ci-deps + - macos-13-ci-deps - almalinux-8-ci-deps - almalinux-8-arm64-ci-deps - almalinux-9-ci-deps @@ -2534,6 +2596,7 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - macos-13 - almalinux-8 - almalinux-9 - amazonlinux-2 @@ -2688,6 +2751,7 @@ jobs: - windows-2019-ci-deps - windows-2022-ci-deps - macos-12-ci-deps + - macos-13-ci-deps - almalinux-8-ci-deps - almalinux-8-arm64-ci-deps - almalinux-9-ci-deps @@ -2725,6 +2789,7 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - macos-13 - almalinux-8 - almalinux-9 - amazonlinux-2 @@ -2770,6 +2835,7 @@ jobs: - ubuntu-2204-pkg-tests - ubuntu-2204-arm64-pkg-tests - macos-12-pkg-tests + - macos-13-pkg-tests - windows-2016-nsis-pkg-tests - windows-2016-msi-pkg-tests - windows-2019-nsis-pkg-tests diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 105b50a3511..efe7ba6ada2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -772,6 +772,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + macos-13-ci-deps: + name: macOS 13 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-macos + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + almalinux-8-ci-deps: name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1773,6 +1790,28 @@ jobs: skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + macos-13-pkg-tests: + name: macOS 13 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-macos-pkgs-onedir + - macos-13-ci-deps + uses: ./.github/workflows/test-packages-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: macos + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + windows-2016-nsis-pkg-tests: name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1993,6 +2032,28 @@ jobs: workflow-slug: nightly default-timeout: 360 + macos-13: + name: macOS 13 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - macos-13-ci-deps + uses: ./.github/workflows/test-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + workflow-slug: nightly + default-timeout: 360 + almalinux-8: name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2553,6 +2614,7 @@ jobs: - windows-2019-ci-deps - windows-2022-ci-deps - macos-12-ci-deps + - macos-13-ci-deps - almalinux-8-ci-deps - almalinux-8-arm64-ci-deps - almalinux-9-ci-deps @@ -2590,6 +2652,7 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - macos-13 - almalinux-8 - almalinux-9 - amazonlinux-2 @@ -3435,6 +3498,7 @@ jobs: - windows-2019-ci-deps - windows-2022-ci-deps - macos-12-ci-deps + - macos-13-ci-deps - almalinux-8-ci-deps - almalinux-8-arm64-ci-deps - almalinux-9-ci-deps @@ -3472,6 +3536,7 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - macos-13 - almalinux-8 - almalinux-9 - amazonlinux-2 @@ -3578,6 +3643,7 @@ jobs: - ubuntu-2204-pkg-tests - ubuntu-2204-arm64-pkg-tests - macos-12-pkg-tests + - macos-13-pkg-tests - windows-2016-nsis-pkg-tests - windows-2016-msi-pkg-tests - windows-2019-nsis-pkg-tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a31e7601e2..c4330c3ef74 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -225,6 +225,22 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + macos-13-ci-deps: + name: macOS 13 Deps + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + almalinux-8-ci-deps: name: Alma Linux 8 Deps needs: @@ -842,6 +858,7 @@ jobs: - fedora-38-arm64-ci-deps - fedora-38-ci-deps - macos-12-ci-deps + - macos-13-ci-deps - photonos-3-arm64-ci-deps - photonos-3-ci-deps - photonos-4-arm64-ci-deps @@ -1044,6 +1061,7 @@ jobs: - windows-2019-ci-deps - windows-2022-ci-deps - macos-12-ci-deps + - macos-13-ci-deps - almalinux-8-ci-deps - almalinux-8-arm64-ci-deps - almalinux-9-ci-deps diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 07ddd71dedd..f8cf3d33d49 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -750,6 +750,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + macos-13-ci-deps: + name: macOS 13 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-macos + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + almalinux-8-ci-deps: name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1751,6 +1768,28 @@ jobs: skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + macos-13-pkg-tests: + name: macOS 13 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-macos-pkgs-onedir + - macos-13-ci-deps + uses: ./.github/workflows/test-packages-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: macos + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + windows-2016-nsis-pkg-tests: name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1971,6 +2010,28 @@ jobs: workflow-slug: scheduled default-timeout: 360 + macos-13: + name: macOS 13 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - macos-13-ci-deps + uses: ./.github/workflows/test-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + workflow-slug: scheduled + default-timeout: 360 + almalinux-8: name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2531,6 +2592,7 @@ jobs: - windows-2019-ci-deps - windows-2022-ci-deps - macos-12-ci-deps + - macos-13-ci-deps - almalinux-8-ci-deps - almalinux-8-arm64-ci-deps - almalinux-9-ci-deps @@ -2568,6 +2630,7 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - macos-13 - almalinux-8 - almalinux-9 - amazonlinux-2 @@ -2724,6 +2787,7 @@ jobs: - windows-2019-ci-deps - windows-2022-ci-deps - macos-12-ci-deps + - macos-13-ci-deps - almalinux-8-ci-deps - almalinux-8-arm64-ci-deps - almalinux-9-ci-deps @@ -2761,6 +2825,7 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - macos-13 - almalinux-8 - almalinux-9 - amazonlinux-2 @@ -2806,6 +2871,7 @@ jobs: - ubuntu-2204-pkg-tests - ubuntu-2204-arm64-pkg-tests - macos-12-pkg-tests + - macos-13-pkg-tests - windows-2016-nsis-pkg-tests - windows-2016-msi-pkg-tests - windows-2019-nsis-pkg-tests diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 68f327890df..45aa6f6d6b8 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -772,6 +772,23 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + macos-13-ci-deps: + name: macOS 13 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-macos + uses: ./.github/workflows/build-deps-ci-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + almalinux-8-ci-deps: name: Alma Linux 8 Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1773,6 +1790,28 @@ jobs: skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + macos-13-pkg-tests: + name: macOS 13 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - build-macos-pkgs-onedir + - macos-13-ci-deps + uses: ./.github/workflows/test-packages-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: macos + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + windows-2016-nsis-pkg-tests: name: Windows 2016 NSIS Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1993,6 +2032,28 @@ jobs: workflow-slug: staging default-timeout: 180 + macos-13: + name: macOS 13 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} + needs: + - prepare-workflow + - macos-13-ci-deps + uses: ./.github/workflows/test-action-macos.yml + with: + distro-slug: macos-13 + nox-session: ci-test-onedir + platform: darwin + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + testrun: ${{ needs.prepare-workflow.outputs.testrun }} + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + workflow-slug: staging + default-timeout: 180 + almalinux-8: name: Alma Linux 8 Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -3386,6 +3447,7 @@ jobs: - fedora-38-arm64-ci-deps - fedora-38-ci-deps - macos-12-ci-deps + - macos-13-ci-deps - photonos-3-arm64-ci-deps - photonos-3-ci-deps - photonos-4-arm64-ci-deps @@ -3422,6 +3484,7 @@ jobs: - windows-2019-ci-deps - windows-2022-ci-deps - macos-12-ci-deps + - macos-13-ci-deps - almalinux-8-ci-deps - almalinux-8-arm64-ci-deps - almalinux-9-ci-deps @@ -3459,6 +3522,7 @@ jobs: - windows-2019 - windows-2022 - macos-12 + - macos-13 - almalinux-8 - almalinux-9 - amazonlinux-2 @@ -3504,6 +3568,7 @@ jobs: - ubuntu-2204-pkg-tests - ubuntu-2204-arm64-pkg-tests - macos-12-pkg-tests + - macos-13-pkg-tests - windows-2016-nsis-pkg-tests - windows-2016-msi-pkg-tests - windows-2019-nsis-pkg-tests diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 7ca255f79ba..32879958651 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -394,7 +394,10 @@ jobs: - distro-slug: macos-12 arch: x86_64 pkg-type: package - - distro-slug: macos-12 + - distro-slug: macos-13 + arch: x86_64 + pkg-type: package + - distro-slug: macos-13 arch: x86_64 pkg-type: onedir diff --git a/tools/pre_commit.py b/tools/pre_commit.py index 9044ffbcfb7..0cd219f139a 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -85,7 +85,7 @@ def generate_workflows(ctx: Context): }, } test_salt_listing = { - "linux": ( + "linux": [ ("almalinux-8", "Alma Linux 8", "x86_64"), ("almalinux-9", "Alma Linux 9", "x86_64"), ("amazonlinux-2", "Amazon Linux 2", "x86_64"), @@ -111,16 +111,19 @@ def generate_workflows(ctx: Context): ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"), ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"), ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64"), - ), - "macos": (("macos-12", "macOS 12", "x86_64"),), - "windows": ( + ], + "macos": [ + ("macos-12", "macOS 12", "x86_64"), + ("macos-13", "macOS 13", "x86_64"), + ], + "windows": [ ("windows-2016", "Windows 2016", "amd64"), ("windows-2019", "Windows 2019", "amd64"), ("windows-2022", "Windows 2022", "amd64"), - ), + ], } test_salt_pkg_listing = { - "linux": ( + "linux": [ ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), ("centos-7", "CentOS 7", "x86_64", "rpm"), ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), @@ -140,13 +143,16 @@ def generate_workflows(ctx: Context): ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64", "deb"), ("ubuntu-22.04", "Ubuntu 22.04", "x86_64", "deb"), ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64", "deb"), - ), - "macos": (("macos-12", "macOS 12", "x86_64"),), - "windows": ( + ], + "macos": [ + ("macos-12", "macOS 12", "x86_64"), + ("macos-13", "macOS 13", "x86_64"), + ], + "windows": [ ("windows-2016", "Windows 2016", "amd64"), ("windows-2019", "Windows 2019", "amd64"), ("windows-2022", "Windows 2022", "amd64"), - ), + ], } build_ci_deps_listing = { "linux": [ @@ -186,6 +192,7 @@ def generate_workflows(ctx: Context): ], "macos": [ ("macos-12", "macOS 12", "x86_64"), + ("macos-13", "macOS 13", "x86_64"), ], "windows": [ ("windows-2016", "Windows 2016", "amd64"),