Skip to content

Fix BoringSSL Windows CI targets failing with windows-latest #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/cpp-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -272,7 +272,7 @@ jobs:
sdk_platform: "darwin"

exclude:
- os: windows-latest
- os: windows-2016
linux_abi: "c++11"
- os: macos-latest
architecture: "x86"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion scripts/gha/print_matrix_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down