Skip to content

Commit 07c7c34

Browse files
authored
[Infra] Attempt to fix #12769 (#12938)
1 parent a2d205c commit 07c7c34

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

.github/workflows/firestore.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ jobs:
105105
(github.event_name == 'pull_request' && needs.changes.outputs.changed == 'true')
106106
strategy:
107107
matrix:
108-
# TODO(#12769): Update to macos-14 which doesn't include Python 3.7
109-
os: [macos-12, ubuntu-latest]
108+
os: [macos-14, ubuntu-latest]
110109

111110
env:
112111
MINT_PATH: ${{ github.workspace }}/mint
@@ -132,7 +131,7 @@ jobs:
132131

133132
- uses: actions/setup-python@v4
134133
with:
135-
python-version: '3.7'
134+
python-version: '3.10'
136135

137136
- name: Setup build
138137
run: scripts/install_prereqs.sh Firestore ${{ runner.os }} cmake
@@ -153,8 +152,7 @@ jobs:
153152

154153
strategy:
155154
matrix:
156-
# TODO(#12769): Update to macos-14 which doesn't include Python 3.7
157-
os: [macos-12]
155+
os: [macos-14]
158156
databaseId: [(default), test-db]
159157

160158
env:
@@ -183,7 +181,7 @@ jobs:
183181

184182
- uses: actions/setup-python@v4
185183
with:
186-
python-version: '3.7'
184+
python-version: '3.10'
187185

188186
- name: Install Secret GoogleService-Info.plist
189187
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/firestore.plist.gpg \
@@ -241,8 +239,7 @@ jobs:
241239

242240
strategy:
243241
matrix:
244-
# TODO(#12769): Update to macos-14 which doesn't include Python 3.7
245-
os: [macos-12]
242+
os: [macos-14]
246243
sanitizer: [asan, tsan]
247244

248245
runs-on: ${{ matrix.os }}
@@ -263,7 +260,7 @@ jobs:
263260
264261
- uses: actions/setup-python@v4
265262
with:
266-
python-version: '3.7'
263+
python-version: '3.10'
267264

268265
- name: Setup build
269266
run: scripts/install_prereqs.sh Firestore ${{ runner.os }} cmake

0 commit comments

Comments
 (0)