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

The macOS-12 environment is deprecated

Browse source
This commit is contained in:
Daniel A. Wozniak 2025-01-20 23:27:59 -07:00 • committed by Daniel Wozniak
parent 6b1cd9e720
commit ca4b04b730
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/test-action.yml vendored
View file

@ -74,7 +74,7 @@ jobs:
if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
runs-on:
- ${{ matrix.arch == 'x86_64' && 'ubuntu-24.04' || inputs.linux_arm_runner }}
- ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || inputs.linux_arm_runner }}
# Full test runs. Each chunk should never take more than 2 hours.
# Partial test runs(no chunk parallelization), 6 Hours
timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}

2
.github/workflows/test-packages-action.yml vendored
View file

@ -61,7 +61,7 @@ jobs:
test-linux:
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }}
runs-on:
- ${{ matrix.arch == 'x86_64' && 'ubuntu-24.04' || 'linux-arm64' }}
- ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
timeout-minutes: 120 # 2 Hours - More than this and something is wrong
strategy:

2
tools/precommit/workflows.py
View file

@ -209,7 +209,6 @@ TEST_SALT_LISTING = PlatformDefinitions(
),
],
"macos": [
MacOS(slug="macos-12", display_name="macOS 12", arch="x86_64"),
MacOS(slug="macos-13", display_name="macOS 13", arch="x86_64"),
MacOS(slug="macos-14", display_name="macOS 14 (M1)", arch="arm64"),
MacOS(slug="macos-15", display_name="macOS 15 (M1)", arch="arm64"),
@ -412,7 +411,6 @@ TEST_SALT_PKG_LISTING = PlatformDefinitions(
),
],
"macos": [
MacOSPkg(slug="macos-12", display_name="macOS 12", arch="x86_64"),
MacOSPkg(slug="macos-13", display_name="macOS 13", arch="x86_64"),
MacOSPkg(slug="macos-14", display_name="macOS 14 (M1)", arch="arm64"),
MacOSPkg(slug="macos-15", display_name="macOS 15 (M1)", arch="arm64"),