From 2bb764c05f0fbe597528f4b40c022b887b99c8fa Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Fri, 19 Apr 2024 09:48:13 -0400 Subject: [PATCH 1/4] 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" } ] From a1a7421f1c7deb229cae2557bcb2b5eeff5866e9 Mon Sep 17 00:00:00 2001 From: Michael Friesen <3517159+mtfriesen@users.noreply.github.com> Date: Wed, 16 Apr 2025 14:38:55 -0400 Subject: [PATCH 2/4] revert to ubuntu 20.04 runner --- .github/workflows/quic.yml | 2 +- .github/workflows/quic_matrix.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/quic.yml b/.github/workflows/quic.yml index 60e73d67..9355caa1 100644 --- a/.github/workflows/quic.yml +++ b/.github/workflows/quic.yml @@ -155,7 +155,7 @@ jobs: matrix: include: - os: 'ubuntu-20.04' - tls: 'openssl' + tls: ['openssl', 'openssl3'] - os: 'ubuntu-22.04' tls: 'openssl3' uses: microsoft/msquic/.github/workflows/build-reuse-unix.yml@main diff --git a/.github/workflows/quic_matrix.json b/.github/workflows/quic_matrix.json index c19b3fc9..bdceca8c 100644 --- a/.github/workflows/quic_matrix.json +++ b/.github/workflows/quic_matrix.json @@ -4,13 +4,13 @@ { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp", "preferred_pool_sku": "Experimental_Boost4" }, { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk", "preferred_pool_sku": "Experimental_Boost4" }, { "env": "azure", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl", "io": "epoll", "preferred_pool_sku": "Experimental_Boost4" }, - { "env": "azure", "os": "ubuntu-22.04", "arch": "x64", "tls": "openssl3", "io": "epoll", "preferred_pool_sku": "Experimental_Boost4" }, + { "env": "azure", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl3", "io": "epoll", "preferred_pool_sku": "Experimental_Boost4" }, { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "iocp", "preferred_pool_sku": "Experimental_Boost4" }, { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "openssl3", "io": "iocp", "preferred_pool_sku": "Experimental_Boost4" }, { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "xdp", "preferred_pool_sku": "Experimental_Boost4" }, { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "wsk", "preferred_pool_sku": "Experimental_Boost4" }, { "env": "lab", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl", "io": "epoll" }, - { "env": "lab", "os": "ubuntu-22.04", "arch": "x64", "tls": "openssl3", "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" }, From 222aebf123820aafeaa80fe5d3898a2ac2443b23 Mon Sep 17 00:00:00 2001 From: Michael Friesen <3517159+mtfriesen@users.noreply.github.com> Date: Wed, 16 Apr 2025 14:47:42 -0400 Subject: [PATCH 3/4] yml --- .github/workflows/quic.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/quic.yml b/.github/workflows/quic.yml index 9355caa1..b42262da 100644 --- a/.github/workflows/quic.yml +++ b/.github/workflows/quic.yml @@ -155,7 +155,9 @@ jobs: matrix: include: - os: 'ubuntu-20.04' - tls: ['openssl', 'openssl3'] + tls: 'openssl' + - os: 'ubuntu-20.04' + tls: 'openssl3' - os: 'ubuntu-22.04' tls: 'openssl3' uses: microsoft/msquic/.github/workflows/build-reuse-unix.yml@main From bb5e005955732cfc9cb2d03565f2946d4d22c2a3 Mon Sep 17 00:00:00 2001 From: Michael Friesen <3517159+mtfriesen@users.noreply.github.com> Date: Wed, 16 Apr 2025 14:49:59 -0400 Subject: [PATCH 4/4] GH runner 20.04 removed --- .github/workflows/quic.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/quic.yml b/.github/workflows/quic.yml index b42262da..bb10727c 100644 --- a/.github/workflows/quic.yml +++ b/.github/workflows/quic.yml @@ -154,10 +154,8 @@ jobs: fail-fast: false matrix: include: - - os: 'ubuntu-20.04' + - os: 'ubuntu-22.04' tls: 'openssl' - - os: 'ubuntu-20.04' - tls: 'openssl3' - os: 'ubuntu-22.04' tls: 'openssl3' uses: microsoft/msquic/.github/workflows/build-reuse-unix.yml@main