Skip to content

Commit 52f21d0

Browse files
committed
ci: Update
Signed-off-by: Zhang fei <zhangfei@iscas.ac.cn>
1 parent 4c8a8c9 commit 52f21d0

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.ci/docker/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ elif [[ "$image" == *linter* ]]; then
7878
DOCKERFILE="linter/Dockerfile"
7979
elif [[ "$image" == *riscv* ]]; then
8080
# Use RISC-V specific Dockerfile
81-
DOCKERFILE="ubuntu-riscv/Dockerfile"
81+
DOCKERFILE="ubuntu-cross-riscv/Dockerfile"
8282
fi
8383

8484
_UCX_COMMIT=7bb2722ff2187a0cad557ae4a6afa090569f83fb
@@ -373,7 +373,7 @@ case "$tag" in
373373
INDUCTOR_BENCHMARKS=yes
374374
;;
375375
pytorch-linux-noble-riscv64-py3.12-gcc14)
376-
# Since riscv64 is a cross-compilation build, add here if necessary.
376+
GCC_VERSION=14
377377
;;
378378
*)
379379
# Catch-all for builds that are not hardcoded.

.ci/docker/ubuntu-riscv/Dockerfile renamed to .ci/docker/ubuntu-cross-riscv/Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
# Cross-compilation Docker container for RISC-V architecture
12
ARG UBUNTU_VERSION
23
FROM --platform=linux/amd64 ubuntu:${UBUNTU_VERSION} as base
34

45
ARG UBUNTU_VERSION
56

6-
ENV RISCV_GCC_VERSION=14
7+
ENV GCC_VERSION=14
78
ENV PYTHON_VERSION=3.12.3
89
ENV DEBIAN_FRONTEND=noninteractive
9-
ENV CC=riscv64-linux-gnu-gcc-${RISCV_GCC_VERSION}
10-
ENV CXX=riscv64-linux-gnu-g++-${RISCV_GCC_VERSION}
10+
ENV CC=riscv64-linux-gnu-gcc-${GCC_VERSION}
11+
ENV CXX=riscv64-linux-gnu-g++-${GCC_VERSION}
1112
ENV QEMU_LD_PREFIX=/usr/riscv64-linux-gnu/
1213
ENV SYSROOT=/opt/sysroot
1314

@@ -27,8 +28,8 @@ RUN apt-get update && apt-get install -y \
2728
cmake \
2829
sudo \
2930
lsb-release \
30-
gcc-${RISCV_GCC_VERSION}-riscv64-linux-gnu \
31-
g++-${RISCV_GCC_VERSION}-riscv64-linux-gnu \
31+
gcc-${GCC_VERSION}-riscv64-linux-gnu \
32+
g++-${GCC_VERSION}-riscv64-linux-gnu \
3233
pkg-config \
3334
&& rm -rf /var/lib/apt/lists/*
3435

@@ -74,8 +75,8 @@ RUN echo "--- Building bzip2 ---" \
7475
&& wget -c https://sourceware.org/pub/bzip2/bzip2-${BZ2_VERSION}.tar.gz \
7576
&& tar -xf bzip2-${BZ2_VERSION}.tar.gz --no-same-permissions --no-same-owner \
7677
&& cd bzip2-${BZ2_VERSION}/ \
77-
&& make CC=riscv64-linux-gnu-gcc-${RISCV_GCC_VERSION} bzip2 bzip2recover libbz2.a \
78-
&& make CC=riscv64-linux-gnu-gcc-${RISCV_GCC_VERSION} -f Makefile-libbz2_so \
78+
&& make CC=riscv64-linux-gnu-gcc-${GCC_VERSION} bzip2 bzip2recover libbz2.a \
79+
&& make CC=riscv64-linux-gnu-gcc-${GCC_VERSION} -f Makefile-libbz2_so \
7980
&& make install PREFIX=${SYSROOT} \
8081
&& cp libbz2.so.${BZ2_VERSION} ${SYSROOT}/lib/ \
8182
&& cd ${SYSROOT}/lib/ \

.github/workflows/riscv64.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: riscv64
22

33
on:
4-
pull_request:
54
push:
65
tags:
76
- ciflow/riscv64/*

0 commit comments

Comments
 (0)