Skip to content

Commit 5527418

Browse files
address CR
1 parent d26214b commit 5527418

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

.github/workflows/libc-fullbuild-tests.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ jobs:
1717
matrix:
1818
include:
1919
- os: ubuntu-24.04
20+
ccache-variant: sccache
2021
c_compiler: clang
2122
cpp_compiler: clang++
2223
- os: ubuntu-24.04-arm
24+
ccache-variant: ccache
2325
c_compiler: clang
2426
cpp_compiler: clang++
2527
# TODO: add back gcc build when it is fixed
@@ -36,27 +38,20 @@ jobs:
3638
# frequent small object writes.
3739
- name: Setup ccache
3840
uses: hendrikmuhs/[email protected]
39-
if: runner.arch == 'X64'
4041
with:
4142
max-size: 1G
4243
key: libc_fullbuild_${{ matrix.c_compiler }}
43-
variant: sccache
44+
variant: ${{ matrix.ccache-variant }}
4445

4546
# Notice:
4647
# - MPFR is required by some of the mathlib tests.
4748
# - Debian has a multilib setup, so we need to symlink the asm directory.
4849
# For more information, see https://wiki.debian.org/Multiarch/LibraryPathOverview
4950
- name: Prepare dependencies (Ubuntu)
50-
shell: bash
5151
run: |
5252
sudo apt-get update
5353
sudo apt-get install -y libmpfr-dev libgmp-dev libmpc-dev ninja-build linux-libc-dev
5454
sudo ln -sf /usr/include/$(uname -p)-linux-gnu/asm /usr/include/asm
55-
if [[ $(uname -m) == 'aarch64' ]]; then
56-
wget https://github.com/mozilla/sccache/releases/download/v0.9.1/sccache-v0.9.1-aarch64-unknown-linux-musl.tar.gz
57-
tar xvaf sccache-v0.9.1-aarch64-unknown-linux-musl.tar.gz
58-
sudo cp sccache-v0.9.1-aarch64-unknown-linux-musl/sccache /usr/bin
59-
fi
6055
6156
- name: Set reusable strings
6257
id: strings

.github/workflows/libc-overlay-tests.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,27 @@ jobs:
1919
include:
2020
# TODO: add linux gcc when it is fixed
2121
- os: ubuntu-24.04
22+
ccache-variant: sccache
2223
compiler:
2324
c_compiler: clang
2425
cpp_compiler: clang++
2526
- os: ubuntu-24.04-arm
27+
ccache-variant: ccache
2628
compiler:
2729
c_compiler: clang
2830
cpp_compiler: clang++
2931
- os: windows-2022
32+
ccache-variant: sccache
3033
compiler:
3134
c_compiler: clang-cl
3235
cpp_compiler: clang-cl
3336
- os: windows-2025
37+
ccache-variant: sccache
3438
compiler:
3539
c_compiler: clang-cl
3640
cpp_compiler: clang-cl
3741
- os: macos-14
42+
ccache-variant: sccache
3843
compiler:
3944
c_compiler: clang
4045
cpp_compiler: clang++
@@ -51,23 +56,17 @@ jobs:
5156
# frequent small object writes.
5257
- name: Setup ccache
5358
uses: hendrikmuhs/ccache-action@v1
54-
if: runner.arch == 'X64'
5559
with:
5660
max-size: 1G
5761
key: libc_overlay_build_${{ matrix.os }}_${{ matrix.compiler.c_compiler }}
58-
variant: sccache
62+
variant: ${{ matrix.ccache-variant }}
5963

6064
# MPFR is required by some of the mathlib tests.
6165
- name: Prepare dependencies (Ubuntu)
6266
if: runner.os == 'Linux'
6367
run: |
6468
sudo apt-get update
6569
sudo apt-get install -y libmpfr-dev libgmp-dev libmpc-dev ninja-build
66-
if [[ $(uname -m) == 'aarch64' ]]; then
67-
wget https://github.com/mozilla/sccache/releases/download/v0.9.1/sccache-v0.9.1-aarch64-unknown-linux-musl.tar.gz
68-
tar xvaf sccache-v0.9.1-aarch64-unknown-linux-musl.tar.gz
69-
sudo cp sccache-v0.9.1-aarch64-unknown-linux-musl/sccache /usr/bin
70-
fi
7170
7271
# Chocolatey is shipped with Windows runners. Windows Server 2025 recommends WinGet.
7372
# Consider migrating to WinGet when Windows Server 2025 is available.

0 commit comments

Comments
 (0)