Skip to content

Commit 6c8449d

Browse files
luhenrymengqin
authored andcommitted
ci : Use ggml-org/ccache-action on RISC-V as well (ggml-org#21632)
1 parent 05999f3 commit 6c8449d

2 files changed

Lines changed: 14 additions & 35 deletions

File tree

.github/workflows/build-riscv.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,10 @@ jobs:
4747
steps:
4848
- name: Install dependencies
4949
run: |
50-
sudo apt-get update
51-
52-
# Install necessary packages
53-
sudo apt-get install -y libatomic1 libtsan2 gcc-14 g++-14 cmake build-essential wget git-lfs
54-
5550
# Set gcc-14 and g++-14 as the default compilers
5651
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
5752
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
5853
59-
if ! which rustc; then
60-
# Install Rust stable version
61-
sudo apt-get install -y rustup
62-
rustup install stable
63-
rustup default stable
64-
fi
65-
6654
git lfs install
6755
6856
- name: GCC version check
@@ -74,12 +62,12 @@ jobs:
7462
id: checkout
7563
uses: actions/checkout@v6
7664

77-
# FIXME: Enable when ggml-org/ccache-action works on riscv64
78-
# - name: ccache
79-
# uses: ggml-org/ccache-action@v1.2.21
80-
# with:
81-
# key: ubuntu-riscv64-native-sanitizer-${{ matrix.sanytizer }}-${{ matrix.build_type }}
82-
# save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
65+
- name: ccache
66+
uses: ggml-org/ccache-action@afde29e5b5422e5da23cb1f639e8baecadeadfc3 # https://github.com/ggml-org/ccache-action/pull/1
67+
with:
68+
key: ubuntu-riscv64-native-sanitizer-${{ matrix.sanitizer }}-${{ matrix.build_type }}
69+
evict-old-files: 1d
70+
save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
8371

8472
- name: Build
8573
id: cmake_build

.github/workflows/build.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,22 +1001,14 @@ jobs:
10011001
steps:
10021002
- name: Install dependencies
10031003
run: |
1004-
sudo apt-get update
1005-
10061004
# Install necessary packages
1007-
sudo apt-get install -y libatomic1 libtsan2 gcc-14 g++-14 cmake build-essential libssl-dev wget git-lfs
1005+
sudo apt-get update
1006+
sudo apt-get install -y libssl-dev
10081007
10091008
# Set gcc-14 and g++-14 as the default compilers
10101009
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
10111010
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
10121011
1013-
if ! which rustc; then
1014-
# Install Rust stable version
1015-
sudo apt-get install -y rustup
1016-
rustup install stable
1017-
rustup default stable
1018-
fi
1019-
10201012
git lfs install
10211013
10221014
- name: Check environment
@@ -1032,13 +1024,12 @@ jobs:
10321024
id: checkout
10331025
uses: actions/checkout@v6
10341026

1035-
# FIXME: Enable when ggml-org/ccache-action works on riscv64
1036-
# - name: ccache
1037-
# uses: ggml-org/ccache-action@v1.2.21
1038-
# with:
1039-
# key: ubuntu-cpu-riscv64-native
1040-
# evict-old-files: 1d
1041-
# save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
1027+
- name: ccache
1028+
uses: ggml-org/ccache-action@afde29e5b5422e5da23cb1f639e8baecadeadfc3 # https://github.com/ggml-org/ccache-action/pull/1
1029+
with:
1030+
key: ubuntu-cpu-riscv64-native
1031+
evict-old-files: 1d
1032+
save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
10421033

10431034
- name: Build
10441035
id: cmake_build

0 commit comments

Comments
 (0)