Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
python_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_python_version) }}
exclude:
# Do not attempt to use arm64 on Windows or Linux.
- os: windows-latest
- os: windows-2022
architecture: arm64
- os: ubuntu-22.04
architecture: arm64
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/cpp-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -320,17 +320,17 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-22.04, macos-15]
os: [windows-2022, ubuntu-22.04, macos-15]
build_type: ["Release", "Debug"]
architecture: ["x64", "x86", "arm64"]
msvc_runtime: ["static", "dynamic"]
linux_abi: ["legacy", "c++11"]
python_version: [3.9]
include:
- os: windows-latest
- os: windows-2022
vcpkg_triplet_suffix: "windows-static"
sdk_platform: "windows"
- os: windows-latest
- os: windows-2022
msvc_runtime: "dynamic"
vcpkg_triplet_suffix: "windows-static-md"
sdk_platform: "windows"
Expand All @@ -344,7 +344,7 @@ jobs:
sdk_platform: "darwin"

exclude:
- os: windows-latest
- os: windows-2022
linux_abi: "c++11"
- os: macos-15
architecture: "x86"
Expand All @@ -360,7 +360,7 @@ jobs:
build_type: "Debug"
- os: ubuntu-22.04
architecture: "arm64"
- os: windows-latest
- os: windows-2022
architecture: "arm64"

steps:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ jobs:
python_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_python_version) }}
include:
# More Windows combinations are in the expanded matrix.
- os: windows-latest
- os: windows-2022
build_type: "Release"
architecture: "x64"
msvc_runtime: "static"
- os: windows-latest
- os: windows-2022
build_type: "Debug"
architecture: "x86"
msvc_runtime: "dynamic"
Expand All @@ -82,16 +82,16 @@ jobs:
# Xcode excludes -- allow only one on osx and linux
- os: ubuntu-22.04
xcode_version: "11.7"
- os: windows-latest
- os: windows-2022
xcode_version: "11.7"
- os: ubuntu-22.04
xcode_version: "12.5.1"
- os: windows-latest
- os: windows-2022
xcode_version: "12.5.1"
# arm64 is only for macos
- os: ubuntu-22.04
architecture: "arm64"
- os: windows-latest
- os: windows-2022
architecture: "arm64"
# arm64 can't be built on Xcode 11
- xcode_version: "11.7"
Expand Down Expand Up @@ -190,6 +190,7 @@ jobs:
python-version: ${{ matrix.python_version }}
architecture: ${{ matrix.architecture }}


- name: Install Desktop SDK prerequisites
uses: nick-invision/retry@v2
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
required: true
operating_systems:
description: 'CSV of VMs to run on'
default: 'ubuntu-22.04,windows-latest,macos-15'
default: 'ubuntu-22.04,windows-2022,macos-15'
required: true
desktop_ssl_variants:
description: 'CSV of desktop SSL variants to use'
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
# places.
exclude:
# Do not attempt to use arm64 on Windows or Linux.
- os: windows-latest
- os: windows-2022
arch: arm64
- os: ubuntu-22.04
arch: arm64
Expand All @@ -289,7 +289,7 @@ jobs:
# system's openssl when cross-compiling, except on Linux. Builds on Linux
# happen on x64 machines, so x86 is technically cross-compiling. Builds on
# Mac happen on arm64 machines, so x64 is technically cross-compiling.
- os: windows-latest
- os: windows-2022
ssl_variant: openssl
arch: x86
- os: macos-15
Expand Down Expand Up @@ -848,7 +848,7 @@ jobs:
# places.
exclude:
# Do not attempt to use arm64 on Windows or Linux.
- os: windows-latest
- os: windows-2022
arch: arm64
- os: ubuntu-22.04
arch: arm64
Expand All @@ -859,7 +859,7 @@ jobs:
# system's openssl when cross-compiling, except on Linux. Builds on Linux
# happen on x64 machines, so x86 is technically cross-compiling. Builds on
# Mac happen on arm64 machines, so x64 is technically cross-compiling.
- os: windows-latest
- os: windows-2022
ssl_variant: openssl
arch: x86
- os: macos-15
Expand Down
8 changes: 4 additions & 4 deletions scripts/gha/print_matrix_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,27 +81,27 @@
"python_version": ["3.9"],

EXPANDED_KEY: {
"os": ["ubuntu-22.04", "macos-15", "windows-latest"],
"os": ["ubuntu-22.04", "macos-15", "windows-2022"],
"xcode_version": ["26.2"],
}
}
},

"android": {
"matrix": {
"os": ["ubuntu-22.04", "macos-15", "windows-latest"],
"os": ["ubuntu-22.04", "macos-15", "windows-2022"],
"architecture": ["x64", "arm64"],
"python_version": ["3.9"],

EXPANDED_KEY: {
"os": ["ubuntu-22.04", "macos-15", "windows-latest"]
"os": ["ubuntu-22.04", "macos-15", "windows-2022"]
}
}
},

"integration_tests": {
"matrix": {
"os": ["ubuntu-22.04", "macos-15", "windows-latest"],
"os": ["ubuntu-22.04", "macos-15", "windows-2022"],
"platform": ["Desktop", "Android", "iOS", "tvOS"],
"ssl_lib": ["openssl"],
"android_device": ["android_target", "emulator_ftl_target"],
Expand Down
Loading