Skip to content

Commit 39cd25b

Browse files
Drop windows-2019 runners from CI (#22186)
PiperOrigin-RevId: 769765346
1 parent c6c8a17 commit 39cd25b

File tree

3 files changed

+11
-43
lines changed

3 files changed

+11
-43
lines changed

.github/workflows/test_cpp.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -416,18 +416,6 @@ jobs:
416416
-Dprotobuf_BUILD_EXAMPLES=ON
417417
vsversion: '2022'
418418
cache-prefix: windows-2022-cmake
419-
continuous-only: true
420-
- name: Windows CMake 2019
421-
os: windows-2019
422-
flags: >-
423-
-G Ninja -Dprotobuf_WITH_ZLIB=OFF -Dprotobuf_BUILD_CONFORMANCE=OFF
424-
-Dprotobuf_BUILD_SHARED_LIBS=OFF
425-
-Dprotobuf_BUILD_EXAMPLES=ON
426-
vsversion: '2019'
427-
cache-prefix: windows-2019-cmake
428-
# windows-2019 has python3.7 installed, which is incompatible with the latest gcloud
429-
python-version: '3.9'
430-
continuous-only: true
431419
- name: Windows CMake 32-bit
432420
os: windows-2022
433421
flags: >-
@@ -470,17 +458,6 @@ jobs:
470458
arch: ${{ matrix.windows-arch || 'x64' }}
471459
vsversion: ${{ matrix.vsversion }}
472460

473-
# Workaround for incompatibility between gcloud and windows-2019 runners.
474-
- name: Install Python
475-
if: ${{ matrix.python-version && (!matrix.continuous-only || inputs.continuous-run) }}
476-
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
477-
with:
478-
python-version: ${{ matrix.python-version }}
479-
- name: Use custom python for gcloud
480-
if: ${{ matrix.python-version && (!matrix.continuous-only || inputs.continuous-run) }}
481-
run: echo "CLOUDSDK_PYTHON=${Python3_ROOT_DIR}\\python3" >> $GITHUB_ENV
482-
shell: bash
483-
484461
- name: Setup sccache
485462
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
486463
uses: protocolbuffers/protobuf-ci/sccache@v4

.github/workflows/test_csharp.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
windows:
5252
name: Windows
53-
runs-on: windows-2019
53+
runs-on: windows-2022
5454
steps:
5555
- name: Checkout pending changes
5656
uses: protocolbuffers/protobuf-ci/checkout@v4
@@ -62,15 +62,6 @@ jobs:
6262
with:
6363
dotnet-version: '6.0.x'
6464

65-
# Workaround for incompatibility between gcloud and windows-2019 runners.
66-
- name: Install Python
67-
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
68-
with:
69-
python-version: '3.9'
70-
- name: Use custom python for gcloud
71-
run: echo "CLOUDSDK_PYTHON=${Python3_ROOT_DIR}\\python3" >> $GITHUB_ENV
72-
shell: bash
73-
7465
- name: Run tests
7566
uses: protocolbuffers/protobuf-ci/bash@v4
7667
with:

.github/workflows/test_upb.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,16 @@ jobs:
196196
- { os: macos-13, python-version: "3.12", architecture: x64, type: 'source', continuous-only: true }
197197

198198
# Windows uses the full API up until Python 3.10.
199-
- { os: windows-2019, python-version: "3.8", architecture: x86, type: 'binary', continuous-only: true }
200-
- { os: windows-2019, python-version: "3.9", architecture: x86, type: 'binary', continuous-only: true }
201-
- { os: windows-2019, python-version: "3.10", architecture: x86, type: 'binary', continuous-only: true }
202-
- { os: windows-2019, python-version: "3.11", architecture: x86, type: 'binary', continuous-only: true }
203-
- { os: windows-2019, python-version: "3.12", architecture: x86, type: 'binary', continuous-only: true }
204-
- { os: windows-2019, python-version: "3.8", architecture: x64, type: 'binary' }
205-
- { os: windows-2019, python-version: "3.9", architecture: x64, type: 'binary', continuous-only: true }
206-
- { os: windows-2019, python-version: "3.10", architecture: x64, type: 'binary', continuous-only: true }
207-
- { os: windows-2019, python-version: "3.11", architecture: x64, type: 'binary', continuous-only: true }
208-
- { os: windows-2019, python-version: "3.12", architecture: x64, type: 'binary' }
199+
- { os: windows-2022, python-version: "3.8", architecture: x86, type: 'binary', continuous-only: true }
200+
- { os: windows-2022, python-version: "3.9", architecture: x86, type: 'binary', continuous-only: true }
201+
- { os: windows-2022, python-version: "3.10", architecture: x86, type: 'binary', continuous-only: true }
202+
- { os: windows-2022, python-version: "3.11", architecture: x86, type: 'binary', continuous-only: true }
203+
- { os: windows-2022, python-version: "3.12", architecture: x86, type: 'binary', continuous-only: true }
204+
- { os: windows-2022, python-version: "3.8", architecture: x64, type: 'binary' }
205+
- { os: windows-2022, python-version: "3.9", architecture: x64, type: 'binary', continuous-only: true }
206+
- { os: windows-2022, python-version: "3.10", architecture: x64, type: 'binary', continuous-only: true }
207+
- { os: windows-2022, python-version: "3.11", architecture: x64, type: 'binary', continuous-only: true }
208+
- { os: windows-2022, python-version: "3.12", architecture: x64, type: 'binary' }
209209
name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} Test Wheels Python ${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.architecture }} ${{ matrix.type }}
210210
needs: build_wheels
211211
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)