Skip to content

Commit

Permalink
Only use free mac runners
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwoz
dwoz committed Nov 11, 2024
1 parent c9e5691 commit 578f82f
Show file tree
Hide file tree
Showing 5 changed files with 561 additions and 14 deletions.
141 changes: 141 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,72 @@ jobs:
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}

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') }}
needs:
- prepare-workflow
- build-pkgs-onedir-macos
- build-ci-deps-macos
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-13
runner: macos-13
nox-session: ci-test-onedir
platform: macos
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.15
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}

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') }}
needs:
- prepare-workflow
- build-pkgs-onedir-macos
- build-ci-deps-macos
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-14
runner: macos-14
nox-session: ci-test-onedir
platform: macos
arch: arm64
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.15
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}

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') }}
needs:
- prepare-workflow
- build-pkgs-onedir-macos
- build-ci-deps-macos
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-15
runner: macos-15
nox-session: ci-test-onedir
platform: macos
arch: arm64
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.15
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}

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') }}
Expand Down Expand Up @@ -1336,6 +1402,72 @@ jobs:
workflow-slug: ci
default-timeout: 180

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') }}
needs:
- prepare-workflow
- build-ci-deps-macos
uses: ./.github/workflows/test-action-macos.yml
with:
distro-slug: macos-13
runner: macos-13
nox-session: ci-test-onedir
platform: macos
arch: x86_64
nox-version: 2022.8.7
gh-actions-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.15
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
workflow-slug: ci
default-timeout: 180

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') }}
needs:
- prepare-workflow
- build-ci-deps-macos
uses: ./.github/workflows/test-action-macos.yml
with:
distro-slug: macos-14
runner: macos-14
nox-session: ci-test-onedir
platform: macos
arch: arm64
nox-version: 2022.8.7
gh-actions-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.15
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
workflow-slug: ci
default-timeout: 180

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') }}
needs:
- prepare-workflow
- build-ci-deps-macos
uses: ./.github/workflows/test-action-macos.yml
with:
distro-slug: macos-15
runner: macos-15
nox-session: ci-test-onedir
platform: macos
arch: arm64
nox-version: 2022.8.7
gh-actions-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.15
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
workflow-slug: ci
default-timeout: 180

test-rockylinux-8:
name: Rocky Linux 8 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-rockylinux-8'] }}
Expand Down Expand Up @@ -1948,6 +2080,9 @@ jobs:
- test-windows-2019
- test-windows-2022
- test-macos-12
- test-macos-13
- test-macos-14
- test-macos-15
- test-rockylinux-8
- test-rockylinux-8-arm64
- test-rockylinux-9
Expand Down Expand Up @@ -2120,6 +2255,9 @@ jobs:
- test-windows-2019
- test-windows-2022
- test-macos-12
- test-macos-13
- test-macos-14
- test-macos-15
- test-rockylinux-8
- test-rockylinux-8-arm64
- test-rockylinux-9
Expand Down Expand Up @@ -2174,6 +2312,9 @@ jobs:
- test-pkg-ubuntu-2404
- test-pkg-ubuntu-2404-arm64
- test-pkg-macos-12
- test-pkg-macos-13
- test-pkg-macos-14
- test-pkg-macos-15
- test-pkg-windows-2019-nsis
- test-pkg-windows-2019-msi
- test-pkg-windows-2022-nsis
Expand Down
138 changes: 138 additions & 0 deletions .github/workflows/nightly.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1311,6 +1311,72 @@ jobs:
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}

test-pkg-macos-13:
name: macOS 13 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-13'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-macos
- build-ci-deps-macos
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-13
runner: macos-13
nox-session: ci-test-onedir
platform: macos
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.15
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}

test-pkg-macos-14:
name: macOS 14 (M1) Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-14'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-macos
- build-ci-deps-macos
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-14
runner: macos-14
nox-session: ci-test-onedir
platform: macos
arch: arm64
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.15
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}

test-pkg-macos-15:
name: macOS 15 (M1) Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-15'] }}
needs:
- prepare-workflow
- build-pkgs-onedir-macos
- build-ci-deps-macos
uses: ./.github/workflows/test-packages-action-macos.yml
with:
distro-slug: macos-15
runner: macos-15
nox-session: ci-test-onedir
platform: macos
arch: arm64
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.15
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}

test-pkg-windows-2019-nsis:
name: Windows 2019 NSIS Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-nsis'] }}
Expand Down Expand Up @@ -1459,6 +1525,72 @@ jobs:
workflow-slug: nightly
default-timeout: 360

test-macos-13:
name: macOS 13 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-13'] }}
needs:
- prepare-workflow
- build-ci-deps-macos
uses: ./.github/workflows/test-action-macos.yml
with:
distro-slug: macos-13
runner: macos-13
nox-session: ci-test-onedir
platform: macos
arch: x86_64
nox-version: 2022.8.7
gh-actions-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.15
skip-code-coverage: true
workflow-slug: nightly
default-timeout: 360

test-macos-14:
name: macOS 14 (M1) Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-14'] }}
needs:
- prepare-workflow
- build-ci-deps-macos
uses: ./.github/workflows/test-action-macos.yml
with:
distro-slug: macos-14
runner: macos-14
nox-session: ci-test-onedir
platform: macos
arch: arm64
nox-version: 2022.8.7
gh-actions-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.15
skip-code-coverage: true
workflow-slug: nightly
default-timeout: 360

test-macos-15:
name: macOS 15 (M1) Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-macos-15'] }}
needs:
- prepare-workflow
- build-ci-deps-macos
uses: ./.github/workflows/test-action-macos.yml
with:
distro-slug: macos-15
runner: macos-15
nox-session: ci-test-onedir
platform: macos
arch: arm64
nox-version: 2022.8.7
gh-actions-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.15
skip-code-coverage: true
workflow-slug: nightly
default-timeout: 360

test-rockylinux-8:
name: Rocky Linux 8 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-rockylinux-8'] }}
Expand Down Expand Up @@ -2808,6 +2940,9 @@ jobs:
- test-windows-2019
- test-windows-2022
- test-macos-12
- test-macos-13
- test-macos-14
- test-macos-15
- test-rockylinux-8
- test-rockylinux-8-arm64
- test-rockylinux-9
Expand Down Expand Up @@ -2926,6 +3061,9 @@ jobs:
- test-pkg-ubuntu-2404
- test-pkg-ubuntu-2404-arm64
- test-pkg-macos-12
- test-pkg-macos-13
- test-pkg-macos-14
- test-pkg-macos-15
- test-pkg-windows-2019-nsis
- test-pkg-windows-2019-msi
- test-pkg-windows-2022-nsis
Expand Down
Loading

0 comments on commit 578f82f

Please sign in to comment.