mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-10 06:41:41 +00:00
Remove support for macos-12, as deprecated by github
This commit is contained in:
parent
911349a8d3
commit
4498c20596
3 changed files with 2 additions and 22 deletions
17
.github/workflows/ci.yml
vendored
17
.github/workflows/ci.yml
vendored
|
@ -114,22 +114,6 @@ jobs:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
macos-12:
|
|
||||||
name: macOS 12
|
|
||||||
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
|
|
||||||
uses: ./.github/workflows/test-macos.yml
|
|
||||||
needs:
|
|
||||||
- lint
|
|
||||||
- generate-actions-workflow
|
|
||||||
with:
|
|
||||||
distro-slug: macos-12
|
|
||||||
display-name: macOS 12
|
|
||||||
container-slug: macos-12
|
|
||||||
timeout: 20
|
|
||||||
runs-on: macos-12
|
|
||||||
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
|
|
||||||
|
|
||||||
|
|
||||||
macos-13:
|
macos-13:
|
||||||
name: macOS 13
|
name: macOS 13
|
||||||
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
|
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
|
||||||
|
@ -293,7 +277,6 @@ jobs:
|
||||||
needs:
|
needs:
|
||||||
- lint
|
- lint
|
||||||
- generate-actions-workflow
|
- generate-actions-workflow
|
||||||
- macos-12
|
|
||||||
- macos-13
|
- macos-13
|
||||||
- macos-14
|
- macos-14
|
||||||
- windows-2022
|
- windows-2022
|
||||||
|
|
3
.github/workflows/templates/generate.py
vendored
3
.github/workflows/templates/generate.py
vendored
|
@ -27,7 +27,6 @@ WINDOWS = [
|
||||||
]
|
]
|
||||||
|
|
||||||
OSX = [
|
OSX = [
|
||||||
"macos-12",
|
|
||||||
"macos-13",
|
"macos-13",
|
||||||
"macos-14",
|
"macos-14",
|
||||||
]
|
]
|
||||||
|
@ -203,7 +202,6 @@ DISTRO_DISPLAY_NAMES = {
|
||||||
"ubuntu-2004": "Ubuntu 20.04",
|
"ubuntu-2004": "Ubuntu 20.04",
|
||||||
"ubuntu-2204": "Ubuntu 22.04",
|
"ubuntu-2204": "Ubuntu 22.04",
|
||||||
"ubuntu-2404": "Ubuntu 24.04",
|
"ubuntu-2404": "Ubuntu 24.04",
|
||||||
"macos-12": "macOS 12",
|
|
||||||
"macos-13": "macOS 13",
|
"macos-13": "macOS 13",
|
||||||
"macos-14": "macOS 14",
|
"macos-14": "macOS 14",
|
||||||
"windows-2022": "Windows 2022",
|
"windows-2022": "Windows 2022",
|
||||||
|
@ -223,7 +221,6 @@ CONTAINER_SLUG_NAMES = {
|
||||||
"ubuntu-2004": "ubuntu-20.04",
|
"ubuntu-2004": "ubuntu-20.04",
|
||||||
"ubuntu-2204": "ubuntu-22.04",
|
"ubuntu-2204": "ubuntu-22.04",
|
||||||
"ubuntu-2404": "ubuntu-24.04",
|
"ubuntu-2404": "ubuntu-24.04",
|
||||||
"macos-12": "macos-12",
|
|
||||||
"macos-13": "macos-13",
|
"macos-13": "macos-13",
|
||||||
"macos-14": "macOS 14",
|
"macos-14": "macOS 14",
|
||||||
"windows-2022": "windows-2022",
|
"windows-2022": "windows-2022",
|
||||||
|
|
4
.github/workflows/test-macos.yml
vendored
4
.github/workflows/test-macos.yml
vendored
|
@ -48,12 +48,12 @@ jobs:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install Python Dependencies with pip breakage
|
- name: Install Python Dependencies with pip breakage
|
||||||
if: ${{ ( inputs.distro-slug != 'macos-12' ) && ( inputs.distro-slug != 'macos-13' ) }}
|
if: ${{ inputs.distro-slug != 'macos-13' }}
|
||||||
run: |
|
run: |
|
||||||
python3 -m pip install --break-system-packages -r tests/requirements.txt
|
python3 -m pip install --break-system-packages -r tests/requirements.txt
|
||||||
|
|
||||||
- name: Install Python Dependencies without pip breakage
|
- name: Install Python Dependencies without pip breakage
|
||||||
if: ${{ ( inputs.distro-slug == 'macos-12' ) || ( inputs.distro-slug == 'macos-13' ) }}
|
if: ${{ inputs.distro-slug == 'macos-13' }}
|
||||||
run: |
|
run: |
|
||||||
python3 -m pip install -r tests/requirements.txt
|
python3 -m pip install -r tests/requirements.txt
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue