Skip to content

Commit 346fee2

Browse files
committed
Update windows build from windows-2019 -> 2022 image
windows-2019 is a deprecated github runner. Updating to 2022 which is considered `latest`.
1 parent 3050f03 commit 346fee2

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ build:ubsan --copt=-fno-sanitize=function --copt=-fno-sanitize=vptr
2828
build --features=layering_check
2929

3030
common --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1
31+
# Use clang-cl by default on Windows (see https://github.com/protocolbuffers/protobuf/issues/20085).
32+
build:windows --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl --extra_execution_platforms=//build_defs:x64_windows-clang-cl --host_platform=//build_defs:x64_windows-clang-cl

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ jobs:
6868
# - ppc64
6969
include:
7070
# to ensure backwards compatibility as long as possible, use earliest versions of OSs available on Github Actions
71-
- os: windows-2019
71+
- os: windows-2022
7272
cpu: x64_windows
7373
bazel_target: dist_zip
74-
- os: windows-2019
74+
- os: windows-2022
7575
cpu: x64_x86_windows
7676
bazel_target: dist_zip
7777
# disabling Mac OS releases for now since they are working through existing build process
@@ -88,7 +88,7 @@ jobs:
8888
with:
8989
name: js
9090

91-
- uses: bazel-contrib/setup-bazel@0.8.5
91+
- uses: bazel-contrib/setup-bazel@0.15.0
9292
with:
9393
token: ${{ secrets.GITHUB_TOKEN }}
9494

0 commit comments

Comments
 (0)