From 7e21dbd42445ff6308c83665eb0eda56ef2d4361 Mon Sep 17 00:00:00 2001 From: "drsanta@google.com" Date: Thu, 3 Jun 2021 14:50:01 -0400 Subject: [PATCH] use windows-2016 in all builds which compile boringssl --- .github/workflows/cpp-packaging.yml | 8 ++++---- .github/workflows/integration_tests.yml | 2 +- scripts/gha/print_matrix_configuration.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml index 85c1fc368..7b2328848 100644 --- a/.github/workflows/cpp-packaging.yml +++ b/.github/workflows/cpp-packaging.yml @@ -246,18 +246,18 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, ubuntu-latest, macos-latest] + os: [windows-2016, ubuntu-latest, macos-latest] build_type: ["Release", "Debug"] architecture: ["x64", "x86"] msvc_runtime: ["static", "dynamic"] linux_abi: ["legacy", "c++11"] python_version: [3.7] include: - - os: windows-latest + - os: windows-2016 vcpkg_triplet_suffix: "windows-static" additional_build_flags: "--build_tests" sdk_platform: "windows" - - os: windows-latest + - os: windows-2016 msvc_runtime: "dynamic" vcpkg_triplet_suffix: "windows-static-md" additional_build_flags: "--build_tests" @@ -272,7 +272,7 @@ jobs: sdk_platform: "darwin" exclude: - - os: windows-latest + - os: windows-2016 linux_abi: "c++11" - os: macos-latest architecture: "x86" diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index c0dcf1fb5..c221a2465 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -18,7 +18,7 @@ on: required: true operating_systems: description: 'CSV of VMs to run on' - default: 'ubuntu-latest,windows-latest,macos-latest' + default: 'ubuntu-latest,windows-2016,macos-latest' required: true desktop_ssl_variants: description: 'CSV of desktop SSL variants to use' diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index f2f76f348..f574c4159 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -97,7 +97,7 @@ "integration_tests": { "matrix": { - "os": ["ubuntu-latest", "macos-latest", "windows-latest"], + "os": ["ubuntu-latest", "macos-latest", "windows-2016"], "platform": ["Desktop", "Android", "iOS"], "ssl_lib": ["openssl", "boringssl"], "android_device": ["virtual:system-images;android-28;google_apis;x86_64+28.0.3", "real:flame+29"],