DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-08 14:16:47 +00:00
Code Issues Releases Wiki Activity

fix: la64 ci (#1134)

Browse Source 
Signed-off-by: longjin <longjin@DragonOS.org>
This commit is contained in:
LoGin 2025-04-22 01:35:30 +08:00 committed by GitHub
parent e80796eb82
commit 2c81a9760e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/makefile.yml vendored
View File

@ -11,14 +11,14 @@ jobs:
name: Format check ${{ matrix.arch }} name: Format check ${{ matrix.arch }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
continue-on-error: true continue-on-error: true
container: dragonos/dragonos-dev:v1.10 container: dragonos/dragonos-dev:v1.11
strategy: strategy:
matrix: matrix:
arch: [x86_64, riscv64, loongarch64] arch: [x86_64, riscv64, loongarch64]
steps: steps:
- run: echo "Running in dragonos/dragonos-dev:v1.10" - run: echo "Running in dragonos/dragonos-dev:v1.11"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Format check - name: Format check
@ -35,14 +35,14 @@ jobs:
name: Kernel static test ${{ matrix.arch }} name: Kernel static test ${{ matrix.arch }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
continue-on-error: true continue-on-error: true
container: dragonos/dragonos-dev:v1.10 container: dragonos/dragonos-dev:v1.11
strategy: strategy:
matrix: matrix:
arch: [x86_64, riscv64, loongarch64] arch: [x86_64, riscv64, loongarch64]
steps: steps:
- run: echo "Running in dragonos/dragonos-dev:v1.10" - run: echo "Running in dragonos/dragonos-dev:v1.11"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -56,7 +56,8 @@ jobs:
build: build:
name: Build ${{ matrix.arch }} name: Build ${{ matrix.arch }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: dragonos/dragonos-dev:v1.10 container: dragonos/dragonos-dev:v1.11
continue-on-error: true
strategy: strategy:
matrix: matrix:
include: include:
@ -72,7 +73,7 @@ jobs:
checkout_params: {} checkout_params: {}
steps: steps:
- run: echo "Running in dragonos/dragonos-dev:v1.10" - run: echo "Running in dragonos/dragonos-dev:v1.11"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: ${{ matrix.checkout_params }} with: ${{ matrix.checkout_params }}
@ -83,8 +84,8 @@ jobs:
HOME: /root HOME: /root
shell: bash -ileo pipefail {0} shell: bash -ileo pipefail {0}
run: | run: |
source ~/.bashrc source $HOME/.bashrc
source ~/.cargo/env source $HOME/.cargo/env
if [[ "$ARCH" == "x86_64" ]]; then if [[ "$ARCH" == "x86_64" ]]; then
export DragonOS_GCC=$HOME/opt/dragonos-gcc/gcc-x86_64-unknown-none/bin export DragonOS_GCC=$HOME/opt/dragonos-gcc/gcc-x86_64-unknown-none/bin
fi fi

3
build-scripts/kernel_build/src/cfiles/mod.rs
View File

@ -20,6 +20,9 @@ impl CFilesBuilder {
Self::setup_defines(&mut c); Self::setup_defines(&mut c);
Self::setup_global_include_dir(&mut c); Self::setup_global_include_dir(&mut c);
Self::setup_files(&mut c); Self::setup_files(&mut c);
if c.get_files().count() == 0 {
return;
}
c.compile("dragonos_kernel_cfiles"); c.compile("dragonos_kernel_cfiles");
} }

2
tools/BUILD_CONTAINER_VERSION
View File

@ -1 +1 @@
v1.10 v1.11

16
tools/bootstrap.sh
View File

@ -242,16 +242,12 @@ rustInstall() {
rustup target add x86_64-unknown-none --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu rustup target add x86_64-unknown-none --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu
rustup target add x86_64-unknown-linux-musl --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu rustup target add x86_64-unknown-linux-musl --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
rustup target add x86_64-unknown-linux-musl --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu rustup target add x86_64-unknown-linux-musl --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu
rustup target add riscv64gc-unknown-none-elf --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
rustup toolchain install $RUST_VERSION-riscv64gc-unknown-linux-gnu --force-non-host rustup target add riscv64gc-unknown-none-elf --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu
rustup toolchain install $RUST_VERSION_OLD-riscv64gc-unknown-linux-gnu --force-non-host rustup target add riscv64imac-unknown-none-elf --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
rustup target add riscv64gc-unknown-none-elf --toolchain $RUST_VERSION-riscv64gc-unknown-linux-gnu rustup target add riscv64imac-unknown-none-elf --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu
rustup target add riscv64imac-unknown-none-elf --toolchain $RUST_VERSION-riscv64gc-unknown-linux-gnu rustup target add riscv64gc-unknown-linux-musl --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
rustup target add riscv64gc-unknown-none-elf --toolchain $RUST_VERSION_OLD-riscv64gc-unknown-linux-gnu rustup target add riscv64gc-unknown-linux-musl --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu
rustup target add riscv64imac-unknown-none-elf --toolchain $RUST_VERSION_OLD-riscv64gc-unknown-linux-gnu
rustup target add riscv64gc-unknown-linux-musl --toolchain $RUST_VERSION-riscv64gc-unknown-linux-gnu
rustup target add riscv64gc-unknown-linux-musl --toolchain $RUST_VERSION_OLD-riscv64gc-unknown-linux-gnu
rustup target add loongarch64-unknown-none --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu rustup target add loongarch64-unknown-none --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
rustup target add loongarch64-unknown-none --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu rustup target add loongarch64-unknown-none --toolchain $RUST_VERSION_OLD-x86_64-unknown-linux-gnu

2
tools/build_in_docker.sh
View File

@ -1,6 +1,6 @@
docker rm -f dragonos-build || echo "No existed container" docker rm -f dragonos-build || echo "No existed container"
cpu_count=$(cat /proc/cpuinfo |grep "processor"|wc -l) cpu_count=$(cat /proc/cpuinfo |grep "processor"|wc -l)
docker run --rm --privileged=true --cap-add SYS_ADMIN --cap-add MKNOD -v $(pwd):/data -v /dev:/dev -v dragonos-build-cargo:/root/.cargo/registry --name dragonos-build -i dragonos/dragonos-dev:v1.10 bash << EOF docker run --rm --privileged=true --cap-add SYS_ADMIN --cap-add MKNOD -v $(pwd):/data -v /dev:/dev -v dragonos-build-cargo:/root/.cargo/registry --name dragonos-build -i dragonos/dragonos-dev:v1.11 bash << EOF
source ~/.cargo/env source ~/.cargo/env
source ~/.bashrc source ~/.bashrc
cd /data cd /data