From 2bb764c05f0fbe597528f4b40c022b887b99c8fa Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Fri, 19 Apr 2024 09:48:13 -0400 Subject: [PATCH] More TLS Combinations --- .github/workflows/quic.yml | 4 ++-- .github/workflows/quic_matrix.json | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/quic.yml b/.github/workflows/quic.yml index 0e8e616a..29b1da9f 100644 --- a/.github/workflows/quic.yml +++ b/.github/workflows/quic.yml @@ -104,7 +104,7 @@ jobs: fail-fast: false matrix: os: ['windows-2022'] - tls: [schannel] # , openssl, openssl3] + tls: [schannel, openssl, openssl3] uses: microsoft/msquic/.github/workflows/build-reuse-win.yml@main with: os: ${{ matrix.os }} @@ -131,7 +131,7 @@ jobs: fail-fast: false matrix: os: ['ubuntu-20.04'] - tls: [openssl] # , openssl3] + tls: [openssl, openssl3] uses: microsoft/msquic/.github/workflows/build-reuse-unix.yml@main with: os: ${{ matrix.os }} diff --git a/.github/workflows/quic_matrix.json b/.github/workflows/quic_matrix.json index 36c4fd17..5a0edf7b 100644 --- a/.github/workflows/quic_matrix.json +++ b/.github/workflows/quic_matrix.json @@ -1,11 +1,19 @@ [ { "env": "azure", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl", "io": "epoll" }, + { "env": "azure", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl3", "io": "epoll" }, + { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "iocp" }, + { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "openssl", "io": "iocp" }, + { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "openssl3", "io": "iocp" }, { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp" }, { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "rio" }, { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk" }, + + { "env": "lab", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl", "io": "epoll" }, + { "env": "lab", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl3", "io": "epoll" }, + { "env": "lab", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "iocp" }, + { "env": "lab", "os": "windows-2022", "arch": "x64", "tls": "openssl3", "io": "iocp" }, { "env": "lab", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp" }, - { "env": "lab", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk" }, - { "env": "lab", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl", "io": "epoll" } + { "env": "lab", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk" } ]