Skip to content

Commit 9910104

Browse files
Drop windows-2019 runners from CI (#22185)
PiperOrigin-RevId: 769765346
1 parent a4508d4 commit 9910104

File tree

3 files changed

+9
-30
lines changed

3 files changed

+9
-30
lines changed

.github/workflows/test_cpp.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -358,16 +358,6 @@ jobs:
358358
-Dprotobuf_BUILD_EXAMPLES=ON
359359
vsversion: '2022'
360360
cache-prefix: windows-2022-cmake
361-
- name: Windows CMake 2019
362-
os: windows-2019
363-
flags: >-
364-
-G Ninja -Dprotobuf_WITH_ZLIB=OFF -Dprotobuf_BUILD_CONFORMANCE=OFF
365-
-Dprotobuf_BUILD_SHARED_LIBS=OFF
366-
-Dprotobuf_BUILD_EXAMPLES=ON
367-
vsversion: '2019'
368-
cache-prefix: windows-2019-cmake
369-
# windows-2019 has python3.7 installed, which is incompatible with the latest gcloud
370-
python-version: '3.9'
371361
- name: Windows CMake 32-bit
372362
os: windows-2022
373363
flags: >-
@@ -407,17 +397,6 @@ jobs:
407397
arch: ${{ matrix.windows-arch || 'x64' }}
408398
vsversion: ${{ matrix.vsversion }}
409399

410-
# Workaround for incompatibility between gcloud and windows-2019 runners.
411-
- name: Install Python
412-
if: ${{ matrix.python-version }}
413-
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
414-
with:
415-
python-version: ${{ matrix.python-version }}
416-
- name: Use custom python for gcloud
417-
if: ${{ matrix.python-version }}
418-
run: echo "CLOUDSDK_PYTHON=${Python3_ROOT_DIR}\\python3" >> $GITHUB_ENV
419-
shell: bash
420-
421400
- name: Setup sccache
422401
uses: protocolbuffers/protobuf-ci/sccache@v2
423402
with:

.github/workflows/test_csharp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
windows:
3232
name: Windows
33-
runs-on: windows-2019
33+
runs-on: windows-2022
3434
steps:
3535
- name: Checkout pending changes
3636
uses: protocolbuffers/protobuf-ci/checkout@v2

.github/workflows/test_upb.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,14 @@ jobs:
179179

180180
# Windows uses the full API up until Python 3.10, so each of these
181181
# jobs tests a distinct binary wheel.
182-
- { os: windows-2019, python-version: "3.8", architecture: x86, type: 'binary' }
183-
- { os: windows-2019, python-version: "3.9", architecture: x86, type: 'binary' }
184-
- { os: windows-2019, python-version: "3.10", architecture: x86, type: 'binary' }
185-
- { os: windows-2019, python-version: "3.11", architecture: x86, type: 'binary' }
186-
- { os: windows-2019, python-version: "3.8", architecture: x64, type: 'binary' }
187-
- { os: windows-2019, python-version: "3.9", architecture: x64, type: 'binary' }
188-
- { os: windows-2019, python-version: "3.10", architecture: x64, type: 'binary' }
189-
- { os: windows-2019, python-version: "3.11", architecture: x64, type: 'binary' }
182+
- { os: windows-2022, python-version: "3.8", architecture: x86, type: 'binary' }
183+
- { os: windows-2022, python-version: "3.9", architecture: x86, type: 'binary' }
184+
- { os: windows-2022, python-version: "3.10", architecture: x86, type: 'binary' }
185+
- { os: windows-2022, python-version: "3.11", architecture: x86, type: 'binary' }
186+
- { os: windows-2022, python-version: "3.8", architecture: x64, type: 'binary' }
187+
- { os: windows-2022, python-version: "3.9", architecture: x64, type: 'binary' }
188+
- { os: windows-2022, python-version: "3.10", architecture: x64, type: 'binary' }
189+
- { os: windows-2022, python-version: "3.11", architecture: x64, type: 'binary' }
190190
runs-on: ${{ matrix.os }}
191191
if: ${{ github.event_name != 'pull_request_target' }}
192192
defaults:

0 commit comments

Comments
 (0)