Skip to content

Commit 6beb689

Browse files
committed
Fix CI
1 parent a9e09ec commit 6beb689

File tree

1 file changed

+60
-13
lines changed

1 file changed

+60
-13
lines changed

.github/workflows/aarch64-linux-gnu-shared.yaml

+60-13
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,40 @@ jobs:
8080
make -j2
8181
make install
8282
83-
- name: cache-toolchain
84-
id: cache-toolchain
83+
- name: cache-toolchain (CPU)
84+
if: matrix.gpu == 'OFF'
85+
id: cache-toolchain-cpu
8586
uses: actions/cache@v4
8687
with:
8788
path: toolchain
8889
key: gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu.tar.xz
8990

90-
- name: Download toolchain
91-
if: steps.cache-toolchain.outputs.cache-hit != 'true'
91+
- name: cache-toolchain (GPU)
92+
if: matrix.gpu == 'ON'
93+
id: cache-toolchain-gpu
94+
uses: actions/cache@v4
95+
with:
96+
path: toolchain
97+
key: gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz
98+
99+
- name: Download toolchain (CPU, gcc 7.5)
100+
if: steps.cache-toolchain-cpu.outputs.cache-hit != 'true' && matrix.gpu == 'OFF'
92101
shell: bash
93102
run: |
94103
wget -qq https://huggingface.co/csukuangfj/sherpa-ncnn-toolchains/resolve/main/gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu.tar.xz
95104
96105
mkdir $GITHUB_WORKSPACE/toolchain
97106
tar xf ./gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain
98107
108+
- name: Download toolchain (GPU, gcc 10.3)
109+
if: steps.cache-toolchain-gpu.outputs.cache-hit != 'true' && matrix.gpu == 'ON'
110+
shell: bash
111+
run: |
112+
wget -qq https://huggingface.co/csukuangfj/sherpa-ncnn-toolchains/resolve/main/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz
113+
114+
mkdir $GITHUB_WORKSPACE/toolchain
115+
tar xf ./gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain
116+
99117
- name: Set environment variable
100118
if: steps.cache-build-result.outputs.cache-hit != 'true'
101119
shell: bash
@@ -104,19 +122,31 @@ jobs:
104122
echo "$GITHUB_WORKSPACE/bin" >> "$GITHUB_PATH"
105123
ls -lh "$GITHUB_WORKSPACE/toolchain/bin"
106124
107-
echo "CC=aarch64-linux-gnu-gcc" >> "$GITHUB_ENV"
108-
echo "CXX=aarch64-linux-gnu-g++" >> "$GITHUB_ENV"
125+
if [[ ${{ matrix.gpu }} == OFF ]]; then
126+
echo "CC=aarch64-linux-gnu-gcc" >> "$GITHUB_ENV"
127+
echo "CXX=aarch64-linux-gnu-g++" >> "$GITHUB_ENV"
128+
else
129+
echo "CC=aarch64-none-linux-gnu-gcc" >> "$GITHUB_ENV"
130+
echo "CXX=aarch64-none-linux-gnu-g++" >> "$GITHUB_ENV"
131+
fi
109132
110133
- name: Display toolchain info
111134
shell: bash
112135
run: |
113-
aarch64-linux-gnu-gcc --version
136+
if [[ ${{ matrix.gpu }} == OFF ]]; then
137+
which aarch64-linux-gnu-gcc
138+
aarch64-linux-gnu-gcc --version
139+
else
140+
which aarch64-none-linux-gnu-gcc
141+
aarch64-none-linux-gnu-gcc --version
142+
fi
114143
115144
- name: Display qemu-aarch64 -h
116145
shell: bash
117146
run: |
118147
export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH
119148
export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/aarch64-linux-gnu/libc
149+
export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/aarch64-none-linux-gnu/libc
120150
qemu-aarch64 -h
121151
122152
- name: build aarch64-linux-gnu
@@ -142,7 +172,11 @@ jobs:
142172
run: |
143173
export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH
144174
export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH
145-
export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/aarch64-linux-gnu/libc
175+
if [[ ${{ matrix.gpu }} == OFF ]]; then
176+
export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/aarch64-linux-gnu/libc
177+
else
178+
export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/aarch64-none-linux-gnu/libc
179+
fi
146180
147181
ls -lh ./build-aarch64-linux-gnu/bin
148182
@@ -153,11 +187,20 @@ jobs:
153187
- name: Copy files
154188
shell: bash
155189
run: |
156-
aarch64-linux-gnu-strip --version
190+
if [[ ${{ matrix.gpu }} == OFF ]]; then
191+
aarch64-linux-gnu-strip --version
192+
else
193+
aarch64-none-linux-gnu-strip --version
194+
fi
157195
158196
SHERPA_ONNX_VERSION=v$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2)
159197
160198
dst=sherpa-onnx-${SHERPA_ONNX_VERSION}-linux-aarch64-shared
199+
if [[ ${{ matrix.gpu }} == OFF ]]; then
200+
dst=${dst}-cpu
201+
else
202+
dst=${dst}-gpu
203+
fi
161204
mkdir $dst
162205
163206
cp -a build-aarch64-linux-gnu/install/bin $dst/
@@ -168,16 +211,20 @@ jobs:
168211
169212
ls -lh $dst/bin/
170213
echo "strip"
171-
aarch64-linux-gnu-strip $dst/bin/*
214+
if [[ ${{ matrix.gpu }} == OFF ]]; then
215+
aarch64-linux-gnu-strip $dst/bin/*
216+
else
217+
aarch64-none-linux-gnu-strip $dst/bin/*
218+
fi
172219
173220
tree $dst
174221
175222
tar cjvf ${dst}.tar.bz2 $dst
176223
177224
- uses: actions/upload-artifact@v4
178225
with:
179-
name: sherpa-onnx-linux-aarch64-shared
180-
path: sherpa-onnx-*linux-aarch64-shared.tar.bz2
226+
name: sherpa-onnx-linux-aarch64-shared-gpu-${{ matrix.gpu }}
227+
path: sherpa-onnx-*linux-aarch64-shared*.tar.bz2
181228

182229
# https://huggingface.co/docs/hub/spaces-github-actions
183230
- name: Publish to huggingface
@@ -200,7 +247,7 @@ jobs:
200247
cd huggingface
201248
mkdir -p aarch64
202249
203-
cp -v ../sherpa-onnx-*-shared.tar.bz2 ./aarch64
250+
cp -v ../sherpa-onnx-*-shared*.tar.bz2 ./aarch64
204251
205252
git status
206253
git lfs track "*.bz2"

0 commit comments

Comments
 (0)