Skip to content

Commit 420dc29

Browse files
authored
Merge pull request #2076 from dmurphy18/fix_2075
Remove support for macos-12, as deprecated by github
2 parents 911349a + 4498c20 commit 420dc29

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,6 @@ jobs:
114114

115115

116116

117-
macos-12:
118-
name: macOS 12
119-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
120-
uses: ./.github/workflows/test-macos.yml
121-
needs:
122-
- lint
123-
- generate-actions-workflow
124-
with:
125-
distro-slug: macos-12
126-
display-name: macOS 12
127-
container-slug: macos-12
128-
timeout: 20
129-
runs-on: macos-12
130-
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
131-
132-
133117
macos-13:
134118
name: macOS 13
135119
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -293,7 +277,6 @@ jobs:
293277
needs:
294278
- lint
295279
- generate-actions-workflow
296-
- macos-12
297280
- macos-13
298281
- macos-14
299282
- windows-2022

.github/workflows/templates/generate.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
]
2828

2929
OSX = [
30-
"macos-12",
3130
"macos-13",
3231
"macos-14",
3332
]
@@ -203,7 +202,6 @@
203202
"ubuntu-2004": "Ubuntu 20.04",
204203
"ubuntu-2204": "Ubuntu 22.04",
205204
"ubuntu-2404": "Ubuntu 24.04",
206-
"macos-12": "macOS 12",
207205
"macos-13": "macOS 13",
208206
"macos-14": "macOS 14",
209207
"windows-2022": "Windows 2022",
@@ -223,7 +221,6 @@
223221
"ubuntu-2004": "ubuntu-20.04",
224222
"ubuntu-2204": "ubuntu-22.04",
225223
"ubuntu-2404": "ubuntu-24.04",
226-
"macos-12": "macos-12",
227224
"macos-13": "macos-13",
228225
"macos-14": "macOS 14",
229226
"windows-2022": "windows-2022",

.github/workflows/test-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ jobs:
4848
- uses: actions/checkout@v4
4949

5050
- name: Install Python Dependencies with pip breakage
51-
if: ${{ ( inputs.distro-slug != 'macos-12' ) && ( inputs.distro-slug != 'macos-13' ) }}
51+
if: ${{ inputs.distro-slug != 'macos-13' }}
5252
run: |
5353
python3 -m pip install --break-system-packages -r tests/requirements.txt
5454
5555
- name: Install Python Dependencies without pip breakage
56-
if: ${{ ( inputs.distro-slug == 'macos-12' ) || ( inputs.distro-slug == 'macos-13' ) }}
56+
if: ${{ inputs.distro-slug == 'macos-13' }}
5757
run: |
5858
python3 -m pip install -r tests/requirements.txt
5959

0 commit comments

Comments
 (0)