ci : Use ggml-org/ccache-action on RISC-V as well (#21632)
This commit is contained in:
@@ -47,22 +47,10 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
|
||||||
|
|
||||||
# Install necessary packages
|
|
||||||
sudo apt-get install -y libatomic1 libtsan2 gcc-14 g++-14 cmake build-essential wget git-lfs
|
|
||||||
|
|
||||||
# Set gcc-14 and g++-14 as the default compilers
|
# Set gcc-14 and g++-14 as the default compilers
|
||||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
|
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
|
||||||
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
|
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
|
||||||
|
|
||||||
if ! which rustc; then
|
|
||||||
# Install Rust stable version
|
|
||||||
sudo apt-get install -y rustup
|
|
||||||
rustup install stable
|
|
||||||
rustup default stable
|
|
||||||
fi
|
|
||||||
|
|
||||||
git lfs install
|
git lfs install
|
||||||
|
|
||||||
- name: GCC version check
|
- name: GCC version check
|
||||||
@@ -74,12 +62,12 @@ jobs:
|
|||||||
id: checkout
|
id: checkout
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
# FIXME: Enable when ggml-org/ccache-action works on riscv64
|
- name: ccache
|
||||||
# - name: ccache
|
uses: ggml-org/ccache-action@afde29e5b5422e5da23cb1f639e8baecadeadfc3 # https://github.com/ggml-org/ccache-action/pull/1
|
||||||
# uses: ggml-org/ccache-action@v1.2.21
|
with:
|
||||||
# with:
|
key: ubuntu-riscv64-native-sanitizer-${{ matrix.sanitizer }}-${{ matrix.build_type }}
|
||||||
# key: ubuntu-riscv64-native-sanitizer-${{ matrix.sanytizer }}-${{ matrix.build_type }}
|
evict-old-files: 1d
|
||||||
# save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
id: cmake_build
|
id: cmake_build
|
||||||
|
|||||||
@@ -1001,22 +1001,14 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
|
||||||
|
|
||||||
# Install necessary packages
|
# Install necessary packages
|
||||||
sudo apt-get install -y libatomic1 libtsan2 gcc-14 g++-14 cmake build-essential libssl-dev wget git-lfs
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y libssl-dev
|
||||||
|
|
||||||
# Set gcc-14 and g++-14 as the default compilers
|
# Set gcc-14 and g++-14 as the default compilers
|
||||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
|
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
|
||||||
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
|
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
|
||||||
|
|
||||||
if ! which rustc; then
|
|
||||||
# Install Rust stable version
|
|
||||||
sudo apt-get install -y rustup
|
|
||||||
rustup install stable
|
|
||||||
rustup default stable
|
|
||||||
fi
|
|
||||||
|
|
||||||
git lfs install
|
git lfs install
|
||||||
|
|
||||||
- name: Check environment
|
- name: Check environment
|
||||||
@@ -1032,13 +1024,12 @@ jobs:
|
|||||||
id: checkout
|
id: checkout
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
# FIXME: Enable when ggml-org/ccache-action works on riscv64
|
- name: ccache
|
||||||
# - name: ccache
|
uses: ggml-org/ccache-action@afde29e5b5422e5da23cb1f639e8baecadeadfc3 # https://github.com/ggml-org/ccache-action/pull/1
|
||||||
# uses: ggml-org/ccache-action@v1.2.21
|
with:
|
||||||
# with:
|
key: ubuntu-cpu-riscv64-native
|
||||||
# key: ubuntu-cpu-riscv64-native
|
evict-old-files: 1d
|
||||||
# evict-old-files: 1d
|
save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
||||||
# save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
|
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
id: cmake_build
|
id: cmake_build
|
||||||
|
|||||||
Reference in New Issue
Block a user