Skip to content

Commit ff927a9

Browse files
committed
Update 2025S
1 parent 2fe8e32 commit ff927a9

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

.github/workflows/build.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ env:
88

99
jobs:
1010
build-doc:
11-
if: github.repository == 'LearningOS/rCore-Tutorial-Code-2024A'
11+
if: github.repository == 'LearningOS/rCore-Tutorial-Code-2025S'
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: Build doc
1616
run: |
17-
git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git user
17+
git clone https://github.com/LearningOS/rCore-Tutorial-Test-2025S.git user
1818
cd os
1919
make
2020
cargo doc --no-deps --verbose
@@ -37,8 +37,8 @@ jobs:
3737
qemu-system-riscv64 --version
3838
rustup target add riscv64gc-unknown-none-elf
3939
git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
40-
git clone https://github.com/LearningOS/rCore-Tutorial-Checker-2024A.git ci-user
41-
git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git ci-user/user
40+
git clone https://github.com/LearningOS/rCore-Tutorial-Checker-2025S.git ci-user
41+
git clone https://github.com/LearningOS/rCore-Tutorial-Test-2025S.git ci-user/user
4242
ID=`git rev-parse --abbrev-ref HEAD | grep -oP 'ch\K[0-9]'`
4343
# cd ci-user && make test CHAPTER=$ID passwd=${{ secrets.BASE_TEST_TOKEN }}
4444
cd ci-user && make test CHAPTER=$ID passwd=${{ secrets.BASE_TEST_TOKEN }} > ../output.txt
@@ -49,22 +49,22 @@ jobs:
4949
cat output.txt | grep -a "Test passed" | grep -oP "\d{1,}/\d{1,}" | xargs -i echo "points={}"
5050
cat output.txt | grep -a "Test passed" | grep -oP "\d{1,}/\d{1,}" | xargs -i echo "points={}" >> $GITHUB_OUTPUT
5151
gitlab-mirror:
52-
if: github.repository == 'LearningOS/rCore-Tutorial-Code-2024A'
52+
if: github.repository == 'LearningOS/rCore-Tutorial-Code-2025S'
5353
runs-on: ubuntu-latest
5454
steps:
5555
- uses: actions/checkout@v1
5656
- name: Mirror + trigger CI
5757
uses: tkf2019/gitlab-mirror-and-ci-action@master
5858
with:
59-
args: "https://git.tsinghua.edu.cn/os-lab/2024a/public/rcore-tutorial-code-2024a"
59+
args: "https://git.tsinghua.edu.cn/os-lab/2025S/public/rcore-tutorial-code-2025S"
6060
env:
6161
GITLAB_HOSTNAME: "git.tsinghua.edu.cn"
6262
GITLAB_PROJECT_ID: "34689"
63-
GITLAB_PROJECT_NAME: "rcore-tutorial-code-2024a"
63+
GITLAB_PROJECT_NAME: "rcore-tutorial-code-2025S"
6464
GITLAB_PROJECT_TOKEN: ${{secrets.GITLAB_PROJECT_TOKEN}}
6565
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
6666
deploy:
67-
if: github.repository != 'LearningOS/rCore-Tutorial-Code-2024A'
67+
if: github.repository != 'LearningOS/rCore-Tutorial-Code-2025S'
6868
name: Deploy to pages
6969
needs: basic-test
7070
runs-on: ubuntu-latest

.gitlab-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ stages:
77
test-code-job:
88
stage: test
99
script:
10-
- git clone https://token:${rCoreCheckToken}@git.tsinghua.edu.cn/os-lab/2024a/ta/rcore-tutorial-checker-2024a.git ci-user
11-
- git clone https://token:${rCoreTestToken}@git.tsinghua.edu.cn/os-lab/2024a/public/rcore-tutorial-test-2024a.git ci-user/user
10+
- git clone https://token:${rCoreCheckToken}@git.tsinghua.edu.cn/os-lab/2025S/ta/rcore-tutorial-checker-2025S.git ci-user
11+
- git clone https://token:${rCoreTestToken}@git.tsinghua.edu.cn/os-lab/2025S/public/rcore-tutorial-test-2025S.git ci-user/user
1212
- cd ci-user && make test CHAPTER=`echo $CI_COMMIT_REF_NAME | grep -oP 'ch\K[0-9]'` passwd=$BASE_TEST_TOKEN OFFLINE=1

README.md

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
# rCore-Tutorial-Code-2024A
1+
# rCore-Tutorial-Code-2025S
22

33
### Code
4-
- [Soure Code of labs for 2024A](https://github.com/LearningOS/rCore-Tutorial-Code-2024A)
4+
- [Soure Code of labs for 2025S](https://github.com/LearningOS/rCore-Tutorial-Code-2025S)
55
### Documents
66

7-
- Concise Manual: [rCore-Tutorial-Guide-2024A](https://LearningOS.github.io/rCore-Tutorial-Guide-2024A/)
7+
- Concise Manual: [rCore-Tutorial-Guide-2025S](https://LearningOS.github.io/rCore-Tutorial-Guide-2025S/)
88

99
- Detail Book [rCore-Tutorial-Book-v3](https://rcore-os.github.io/rCore-Tutorial-Book-v3/)
1010

1111

12-
### OS API docs of rCore Tutorial Code 2024A
13-
- [OS API docs of ch1](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch1/os/index.html)
14-
AND [OS API docs of ch2](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch2/os/index.html)
15-
- [OS API docs of ch3](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch3/os/index.html)
16-
AND [OS API docs of ch4](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch4/os/index.html)
17-
- [OS API docs of ch5](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch5/os/index.html)
18-
AND [OS API docs of ch6](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch6/os/index.html)
19-
- [OS API docs of ch7](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch7/os/index.html)
20-
AND [OS API docs of ch8](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch8/os/index.html)
21-
- [OS API docs of ch9](https://learningos.github.io/rCore-Tutorial-Code-2024A/ch9/os/index.html)
12+
### OS API docs of rCore Tutorial Code 2025S
13+
- [OS API docs of ch1](https://learningos.github.io/rCore-Tutorial-Code-2025S/ch1/os/index.html)
14+
AND [OS API docs of ch2](https://learningos.github.io/rCore-Tutorial-Code-2025S/ch2/os/index.html)
15+
- [OS API docs of ch3](https://learningos.github.io/rCore-Tutorial-Code-2025S/ch3/os/index.html)
16+
AND [OS API docs of ch4](https://learningos.github.io/rCore-Tutorial-Code-2025S/ch4/os/index.html)
17+
- [OS API docs of ch5](https://learningos.github.io/rCore-Tutorial-Code-2025S/ch5/os/index.html)
18+
AND [OS API docs of ch6](https://learningos.github.io/rCore-Tutorial-Code-2025S/ch6/os/index.html)
19+
- [OS API docs of ch7](https://learningos.github.io/rCore-Tutorial-Code-2025S/ch7/os/index.html)
20+
AND [OS API docs of ch8](https://learningos.github.io/rCore-Tutorial-Code-2025S/ch8/os/index.html)
21+
- [OS API docs of ch9](https://learningos.github.io/rCore-Tutorial-Code-2025S/ch9/os/index.html)
2222

2323
### Related Resources
2424
- [Learning Resource](https://github.com/LearningOS/rust-based-os-comp2022/blob/main/relatedinfo.md)
@@ -28,9 +28,9 @@
2828

2929
```bash
3030
# setup build&run environment first
31-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
32-
$ cd rCore-Tutorial-Code-2024A
33-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git user
31+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2025S.git
32+
$ cd rCore-Tutorial-Code-2025S
33+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2025S.git user
3434
$ cd os
3535
$ git checkout ch$ID
3636
$ make run
@@ -41,10 +41,10 @@ Notice: $ID is from [1-9]
4141

4242
```bash
4343
# setup build&run environment first
44-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
45-
$ cd rCore-Tutorial-Code-2024A
46-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Checker-2024A.git ci-user
47-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git ci-user/user
44+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2025S.git
45+
$ cd rCore-Tutorial-Code-2025S
46+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Checker-2025S.git ci-user
47+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2025S.git ci-user/user
4848
$ cd ci-user && make test CHAPTER=$ID
4949
```
5050
Notice: $ID is from [3,4,5,6,8]

0 commit comments

Comments
 (0)