From 8958a6c7d79dc56d8aa29a2a79a7915facbb21e5 Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Fri, 2 May 2025 08:18:59 -0400 Subject: [PATCH 1/4] Clean up the Ubuntu build excludes --- .github/workflows/build.yml | 55 +++++++++++++++---------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0024ed0b8..d22a03f55d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -128,50 +128,39 @@ jobs: codecheck: ['', '-CodeCheck'] xdp: ['', '-UseXdp'] exclude: - # Android doesn't support x86 + # Android doesn't support x86, XDP, Clang, CodeCheck or SystemCrypto - plat: android arch: x86 - # Android doesn't use system crypto - plat: android systemcrypto: '-UseSystemOpenSSLCrypto' - # No openssl system crypto on ubuntu-22.04 - - plat: linux - os: 'ubuntu-22.04' - tls: 'quictls' - systemcrypto: '-UseSystemOpenSSLCrypto' - # No openssl system crypto on ubuntu-24.04 - - plat: linux - os: 'ubuntu-24.04' - tls: 'quictls' - systemcrypto: '-UseSystemOpenSSLCrypto' - # linux xdp is for ubuntu24.04 only for now - plat: android xdp: "-UseXdp" - - os: 'ubuntu-22.04' - xdp: "-UseXdp" - - arch: x86 - xdp: "-UseXdp" - # Android doesn't use Clang - plat: android clang: '-Clang' - # Android doesn't use CodeCheck - plat: android codecheck: '-CodeCheck' - # No need to combine SystemCrypto and CodeCheck - - systemcrypto: '-UseSystemOpenSSLCrypto' - codecheck: '-CodeCheck' - # No need to combine Static and CodeCheck - - static: '-Static' - codecheck: '-CodeCheck' - # No need to combine Clang and CodeCheck - - clang: '-Clang' - codecheck: '-CodeCheck' - # Release builds fail with CodeCheck - - config: 'Release' - codecheck: '-CodeCheck' + # CodeCheck doesn't work with SystemCrypto, Clang, Static or Release builds + - codecheck: '-CodeCheck' + systemcrypto: '-UseSystemOpenSSLCrypto' + - codecheck: '-Clang' + systemcrypto: '-UseSystemOpenSSLCrypto' + - codecheck: '-Static' + systemcrypto: '-UseSystemOpenSSLCrypto' + - codecheck: '-Release' + systemcrypto: '-UseSystemOpenSSLCrypto' # Static build can't dynamically link to libcrypto - - systemcrypto: '-UseSystemOpenSSLCrypto' - static: '-Static' + - static: '-Static' + systemcrypto: '-UseSystemOpenSSLCrypto' + # No openssl system crypto on ubuntu 22.04 or 24.04 + - os: 'ubuntu-22.04' + systemcrypto: '-UseSystemOpenSSLCrypto' + - os: 'ubuntu-24.04' + systemcrypto: '-UseSystemOpenSSLCrypto' + # Linux xdp is for x64 ubuntu24.04 only for now + - xdp: "-UseXdp" + os: 'ubuntu-22.04' + - xdp: "-UseXdp" + arch: x86 uses: ./.github/workflows/build-reuse-unix.yml with: config: ${{ matrix.config }} From c920d26978b5a6c136e28d908507119ce1ee337e Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Fri, 2 May 2025 09:03:05 -0400 Subject: [PATCH 2/4] fix copy/paste bug --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d22a03f55d..5d98a7e697 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -142,12 +142,12 @@ jobs: # CodeCheck doesn't work with SystemCrypto, Clang, Static or Release builds - codecheck: '-CodeCheck' systemcrypto: '-UseSystemOpenSSLCrypto' - - codecheck: '-Clang' - systemcrypto: '-UseSystemOpenSSLCrypto' - - codecheck: '-Static' - systemcrypto: '-UseSystemOpenSSLCrypto' - - codecheck: '-Release' - systemcrypto: '-UseSystemOpenSSLCrypto' + - codecheck: '-CodeCheck' + systemcrypto: '-Clang' + - codecheck: '-CodeCheck' + systemcrypto: '-Static' + - codecheck: '-CodeCheck' + systemcrypto: '-Release' # Static build can't dynamically link to libcrypto - static: '-Static' systemcrypto: '-UseSystemOpenSSLCrypto' From e73d495b16309ba7dc4e1c697653992c17747867 Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Fri, 2 May 2025 09:04:08 -0400 Subject: [PATCH 3/4] more copy/paste errors --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d98a7e697..da8364f519 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,11 +143,11 @@ jobs: - codecheck: '-CodeCheck' systemcrypto: '-UseSystemOpenSSLCrypto' - codecheck: '-CodeCheck' - systemcrypto: '-Clang' + clang: '-Clang' - codecheck: '-CodeCheck' - systemcrypto: '-Static' + static: '-Static' - codecheck: '-CodeCheck' - systemcrypto: '-Release' + config: '-Release' # Static build can't dynamically link to libcrypto - static: '-Static' systemcrypto: '-UseSystemOpenSSLCrypto' From 1cf2292693b29640f345f2a111bac4fa27765709 Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Fri, 2 May 2025 09:40:14 -0400 Subject: [PATCH 4/4] Another issue --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da8364f519..762c11e2dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,7 +147,7 @@ jobs: - codecheck: '-CodeCheck' static: '-Static' - codecheck: '-CodeCheck' - config: '-Release' + config: Release # Static build can't dynamically link to libcrypto - static: '-Static' systemcrypto: '-UseSystemOpenSSLCrypto'