Skip to content

Commit 078d372

Browse files
committed
fix(CI): remove container
1 parent aae0392 commit 078d372

2 files changed

Lines changed: 29 additions & 16 deletions

File tree

.github/workflows/workflow.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,39 @@ jobs:
2424
qemu-exercise:
2525
runs-on: ubuntu-latest
2626
timeout-minutes: 30
27-
container:
28-
image: duskmoon/dev-env:rcore-ci
2927
strategy:
3028
fail-fast: false
3129
matrix:
3230
ch: [3, 4, 5, 6, 8]
3331
steps:
3432
- uses: actions/checkout@v4
3533

36-
- name: Sanity check toolchain in container
34+
- name: Install system dependencies
35+
run: |
36+
sudo apt-get update
37+
sudo apt-get install -y \
38+
qemu-system-misc \
39+
python3 \
40+
git \
41+
curl \
42+
build-essential
43+
44+
- name: Sanity check system tools
3745
run: |
3846
set -eux
3947
qemu-system-riscv64 --version
4048
python3 --version
49+
git --version
50+
51+
- name: Install Rust toolchain
52+
uses: dtolnay/rust-toolchain@stable
53+
with:
54+
targets: riscv64gc-unknown-none-elf
55+
components: rust-src, llvm-tools-preview
56+
57+
- name: Sanity check Rust
58+
run: |
59+
set -eux
4160
rustc --version
4261
cargo --version
4362
rustup --version
@@ -50,12 +69,6 @@ jobs:
5069
run: |
5170
git clone --depth 1 https://github.com/LearningOS/rCore-Tutorial-Checker-2025S.git checker
5271
53-
- name: Install Rust components/targets
54-
run: |
55-
set -eux
56-
rustup target add riscv64gc-unknown-none-elf
57-
rustup component add rust-src llvm-tools-preview
58-
5972
- name: Run exercise in QEMU and check output (ch${{ matrix.ch }})
6073
run: |
6174
timeout 3m cargo qemu --ch ${{ matrix.ch }} --exercise --nobios --ci 2>&1 \

tg-linker/src/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,13 @@ impl KernelLayout {
210210
}
211211

212212
Self {
213-
text: __start as _,
214-
rodata: __rodata as _,
215-
data: __data as _,
216-
sbss: __sbss as _,
217-
ebss: __ebss as _,
218-
boot: __boot as _,
219-
end: __end as _,
213+
text: __start as *const () as _,
214+
rodata: __rodata as *const () as _,
215+
data: __data as *const () as _,
216+
sbss: __sbss as *const () as _,
217+
ebss: __ebss as *const () as _,
218+
boot: __boot as *const () as _,
219+
end: __end as *const () as _,
220220
}
221221
}
222222

0 commit comments

Comments
 (0)