mirror of
https://github.com/intel/llvm.git
synced 2026-01-26 21:53:12 +08:00
[libc][Github] Remove ccache variant logic (#152042)
https://github.com/hendrikmuhs/ccache-action/issues/279 has now been resolved, so we can use sccache for the arm tests too and do not need to differentiate between platforms.
This commit is contained in:
12
.github/workflows/libc-fullbuild-tests.yml
vendored
12
.github/workflows/libc-fullbuild-tests.yml
vendored
@@ -20,36 +20,30 @@ jobs:
|
||||
include:
|
||||
- os: ubuntu-24.04
|
||||
build_type: Debug
|
||||
ccache-variant: sccache
|
||||
c_compiler: clang-22
|
||||
cpp_compiler: clang++-22
|
||||
target: x86_64-unknown-linux-llvm
|
||||
include_scudo: ON
|
||||
- os: ubuntu-24.04
|
||||
build_type: Release
|
||||
ccache-variant: sccache
|
||||
c_compiler: clang-22
|
||||
cpp_compiler: clang++-22
|
||||
target: x86_64-unknown-linux-llvm
|
||||
include_scudo: ON
|
||||
- os: ubuntu-24.04
|
||||
build_type: MinSizeRel
|
||||
ccache-variant: sccache
|
||||
c_compiler: clang-22
|
||||
cpp_compiler: clang++-22
|
||||
target: x86_64-unknown-linux-llvm
|
||||
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-22
|
||||
cpp_compiler: clang++-22
|
||||
target: aarch64-unknown-linux-llvm
|
||||
include_scudo: ON
|
||||
- os: ubuntu-24.04
|
||||
build_type: Debug
|
||||
ccache-variant: ccache
|
||||
c_compiler: clang-22
|
||||
cpp_compiler: clang++-22
|
||||
target: x86_64-unknown-uefi-llvm
|
||||
@@ -71,7 +65,7 @@ jobs:
|
||||
with:
|
||||
max-size: 1G
|
||||
key: libc_fullbuild_${{ matrix.c_compiler }}
|
||||
variant: ${{ matrix.ccache-variant }}
|
||||
variant: sccache
|
||||
|
||||
# Notice:
|
||||
# - MPFR is required by some of the mathlib tests.
|
||||
@@ -112,8 +106,8 @@ jobs:
|
||||
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \
|
||||
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
|
||||
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
|
||||
-DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} \
|
||||
-DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache-variant }} \
|
||||
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
|
||||
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
|
||||
-DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.build-install-dir }} \
|
||||
-DLLVM_RUNTIME_TARGETS=${{ matrix.target }} \
|
||||
-DLLVM_ENABLE_RUNTIMES="$RUNTIMES" \
|
||||
|
||||
12
.github/workflows/libc-overlay-tests.yml
vendored
12
.github/workflows/libc-overlay-tests.yml
vendored
@@ -20,28 +20,22 @@ jobs:
|
||||
include:
|
||||
# TODO: add linux gcc when it is fixed
|
||||
- os: ubuntu-24.04
|
||||
ccache-variant: sccache
|
||||
compiler:
|
||||
c_compiler: clang
|
||||
cpp_compiler: clang++
|
||||
# TODO: remove ccache logic when https://github.com/hendrikmuhs/ccache-action/issues/279 is resolved.
|
||||
- os: ubuntu-24.04-arm
|
||||
ccache-variant: ccache
|
||||
compiler:
|
||||
c_compiler: clang
|
||||
cpp_compiler: clang++
|
||||
- os: windows-2022
|
||||
ccache-variant: sccache
|
||||
compiler:
|
||||
c_compiler: clang-cl
|
||||
cpp_compiler: clang-cl
|
||||
- os: windows-2025
|
||||
ccache-variant: sccache
|
||||
compiler:
|
||||
c_compiler: clang-cl
|
||||
cpp_compiler: clang-cl
|
||||
- os: macos-14
|
||||
ccache-variant: sccache
|
||||
compiler:
|
||||
c_compiler: clang
|
||||
cpp_compiler: clang++
|
||||
@@ -61,7 +55,7 @@ jobs:
|
||||
with:
|
||||
max-size: 1G
|
||||
key: libc_overlay_build_${{ matrix.os }}_${{ matrix.compiler.c_compiler }}
|
||||
variant: ${{ matrix.ccache-variant }}
|
||||
variant: sccache
|
||||
|
||||
# MPFR is required by some of the mathlib tests.
|
||||
- name: Prepare dependencies (Ubuntu)
|
||||
@@ -97,8 +91,8 @@ jobs:
|
||||
-DCMAKE_CXX_COMPILER=${{ matrix.compiler.cpp_compiler }}
|
||||
-DCMAKE_C_COMPILER=${{ matrix.compiler.c_compiler }}
|
||||
-DCMAKE_BUILD_TYPE=Debug
|
||||
-DCMAKE_C_COMPILER_LAUNCHER=${{ matrix.ccache-variant }}
|
||||
-DCMAKE_CXX_COMPILER_LAUNCHER=${{ matrix.ccache-variant }}
|
||||
-DCMAKE_C_COMPILER_LAUNCHER=sccache
|
||||
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache
|
||||
-DCMAKE_POLICY_DEFAULT_CMP0141=NEW
|
||||
-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=Embedded
|
||||
-DLLVM_ENABLE_RUNTIMES=libc
|
||||
|
||||
Reference in New Issue
Block a user