From 38cf8c99d4c1717e2861fe0eb46d8570e4840e94 Mon Sep 17 00:00:00 2001 From: Amy Huang Date: Fri, 27 Jun 2025 14:32:56 -0700 Subject: [PATCH 1/6] Make sure all matrix options are run in the libc premerge testing --- .github/workflows/libc-fullbuild-tests.yml | 1 + .github/workflows/libc-overlay-tests.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/libc-fullbuild-tests.yml b/.github/workflows/libc-fullbuild-tests.yml index 24d75f58d45e0..35d31e38979b8 100644 --- a/.github/workflows/libc-fullbuild-tests.yml +++ b/.github/workflows/libc-fullbuild-tests.yml @@ -16,6 +16,7 @@ jobs: fail-fast: false matrix: build_type: [Debug, Release, MinSizeRel] + os: [ubuntu-24.04, ubuntu-24.04-arm] include: - os: ubuntu-24.04 ccache-variant: sccache diff --git a/.github/workflows/libc-overlay-tests.yml b/.github/workflows/libc-overlay-tests.yml index da82d8d9fe8ab..a4958fbbeb58f 100644 --- a/.github/workflows/libc-overlay-tests.yml +++ b/.github/workflows/libc-overlay-tests.yml @@ -17,6 +17,7 @@ jobs: fail-fast: false matrix: build_type: [Debug, Release, MinSizeRel] + os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, windows-2025, macos-14] include: # TODO: add linux gcc when it is fixed - os: ubuntu-24.04 From f5a6e45b9c4dd933bec06ae4d14bf5de167c809a Mon Sep 17 00:00:00 2001 From: Amy Huang Date: Mon, 30 Jun 2025 15:10:08 -0700 Subject: [PATCH 2/6] Try to only build all of debug/release/minsizerel on linux fullbuilds --- .github/workflows/libc-fullbuild-tests.yml | 2 ++ .github/workflows/libc-overlay-tests.yml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/libc-fullbuild-tests.yml b/.github/workflows/libc-fullbuild-tests.yml index 35d31e38979b8..15dd87d8740f2 100644 --- a/.github/workflows/libc-fullbuild-tests.yml +++ b/.github/workflows/libc-fullbuild-tests.yml @@ -26,12 +26,14 @@ jobs: include_scudo: ON # TODO: remove ccache logic when https://github.com/hendrikmuhs/ccache-action/issues/279 is resolved. - os: ubuntu-24.04-arm + build_type: Debug ccache-variant: ccache c_compiler: clang-21 cpp_compiler: clang++-21 target: aarch64-unknown-linux-llvm include_scudo: ON - os: ubuntu-24.04 + build_type: Debug ccache-variant: ccache c_compiler: clang-21 cpp_compiler: clang++-21 diff --git a/.github/workflows/libc-overlay-tests.yml b/.github/workflows/libc-overlay-tests.yml index a4958fbbeb58f..ec1abfb8e9e0c 100644 --- a/.github/workflows/libc-overlay-tests.yml +++ b/.github/workflows/libc-overlay-tests.yml @@ -16,7 +16,6 @@ jobs: # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. fail-fast: false matrix: - build_type: [Debug, Release, MinSizeRel] os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, windows-2025, macos-14] include: # TODO: add linux gcc when it is fixed @@ -97,7 +96,7 @@ jobs: cmake -B ${{ steps.strings.outputs.build-output-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.compiler.c_compiler }} - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} -DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} -DCMAKE_POLICY_DEFAULT_CMP0141=NEW From 3191cb9efb89541a4432a01520a29c9d8f7c9bea Mon Sep 17 00:00:00 2001 From: Amy Huang Date: Mon, 30 Jun 2025 15:17:32 -0700 Subject: [PATCH 3/6] Trying to figure out how the matrix works --- .github/workflows/libc-fullbuild-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/libc-fullbuild-tests.yml b/.github/workflows/libc-fullbuild-tests.yml index 15dd87d8740f2..ae472705c1b09 100644 --- a/.github/workflows/libc-fullbuild-tests.yml +++ b/.github/workflows/libc-fullbuild-tests.yml @@ -15,8 +15,10 @@ jobs: strategy: fail-fast: false matrix: + # Build linux configuration with Debug, Release, and MinSizeRel. + # Build all other configurations in only Debug. build_type: [Debug, Release, MinSizeRel] - os: [ubuntu-24.04, ubuntu-24.04-arm] + os: [ubuntu-24.04] include: - os: ubuntu-24.04 ccache-variant: sccache From 917a60dd5a613d3868a9a91c59bce1a54ce3cf88 Mon Sep 17 00:00:00 2001 From: Amy Huang Date: Mon, 30 Jun 2025 15:49:33 -0700 Subject: [PATCH 4/6] Fix again --- .github/workflows/libc-fullbuild-tests.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/libc-fullbuild-tests.yml b/.github/workflows/libc-fullbuild-tests.yml index ae472705c1b09..76548b8984936 100644 --- a/.github/workflows/libc-fullbuild-tests.yml +++ b/.github/workflows/libc-fullbuild-tests.yml @@ -15,12 +15,18 @@ jobs: strategy: fail-fast: false matrix: - # Build linux configuration with Debug, Release, and MinSizeRel. - # Build all other configurations in only Debug. - build_type: [Debug, Release, MinSizeRel] - os: [ubuntu-24.04] + # Build basic linux configuration with Debug and MinSizeRel and all + # other configurations in Debug only. include: - os: ubuntu-24.04 + build_type: Debug + ccache-variant: sccache + c_compiler: clang-21 + cpp_compiler: clang++-21 + target: x86_64-unknown-linux-llvm + include_scudo: ON + - os: ubuntu-24.04 + build_type: MinSizeRel ccache-variant: sccache c_compiler: clang-21 cpp_compiler: clang++-21 From d3a320e02ad8d69bd57f85514b18c16814e4e246 Mon Sep 17 00:00:00 2001 From: Amy Huang Date: Wed, 2 Jul 2025 15:51:16 -0700 Subject: [PATCH 5/6] Fix cmake var and remove extra line passing a MinSizeRel config --- .github/workflows/libc-fullbuild-tests.yml | 2 +- .github/workflows/libc-overlay-tests.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/libc-fullbuild-tests.yml b/.github/workflows/libc-fullbuild-tests.yml index 76548b8984936..3cd6553a04bd9 100644 --- a/.github/workflows/libc-fullbuild-tests.yml +++ b/.github/workflows/libc-fullbuild-tests.yml @@ -108,7 +108,7 @@ jobs: -DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} \ -DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} \ -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.build-install-dir }} \ - -DLLVM_RUNTIMES_TARGET=${{ matrix.target }} \ + -DLLVM_RUNTIME_TARGETS=${{ matrix.target }} \ -DLLVM_ENABLE_RUNTIMES="$RUNTIMES" \ -DLLVM_LIBC_FULL_BUILD=ON \ -G Ninja \ diff --git a/.github/workflows/libc-overlay-tests.yml b/.github/workflows/libc-overlay-tests.yml index ec1abfb8e9e0c..f001daae030a3 100644 --- a/.github/workflows/libc-overlay-tests.yml +++ b/.github/workflows/libc-overlay-tests.yml @@ -110,7 +110,6 @@ jobs: cmake --build ${{ steps.strings.outputs.build-output-dir }} --parallel - --config MinSizeRel --target libc - name: Test From 58875570c23d28cb606ff513a6fc7307d2809557 Mon Sep 17 00:00:00 2001 From: Amy Huang Date: Wed, 2 Jul 2025 15:53:42 -0700 Subject: [PATCH 6/6] add back release mode --- .github/workflows/libc-fullbuild-tests.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/libc-fullbuild-tests.yml b/.github/workflows/libc-fullbuild-tests.yml index 3cd6553a04bd9..9b2d8dd579702 100644 --- a/.github/workflows/libc-fullbuild-tests.yml +++ b/.github/workflows/libc-fullbuild-tests.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - # Build basic linux configuration with Debug and MinSizeRel and all + # Build basic linux configuration with Debug/Release/MinSizeRel and all # other configurations in Debug only. include: - os: ubuntu-24.04 @@ -25,6 +25,13 @@ jobs: cpp_compiler: clang++-21 target: x86_64-unknown-linux-llvm include_scudo: ON + - os: ubuntu-24.04 + build_type: Release + ccache-variant: sccache + c_compiler: clang-21 + cpp_compiler: clang++-21 + target: x86_64-unknown-linux-llvm + include_scudo: ON - os: ubuntu-24.04 build_type: MinSizeRel ccache-variant: sccache