Skip to content

Commit c7f4eb7

Browse files
committed
Update 2024A
1 parent 8619a31 commit c7f4eb7

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
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-2024S'
11+
if: github.repository == 'LearningOS/rCore-Tutorial-Code-2024A'
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-2024S.git user
17+
git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git user
1818
cd os
1919
make
2020
cargo doc --no-deps --verbose
@@ -25,17 +25,17 @@ jobs:
2525
publish_dir: ./os/target/riscv64gc-unknown-none-elf/doc
2626
destination_dir: ${{ github.ref_name }}
2727
gitlab-mirror:
28-
if: github.repository == 'LearningOS/rCore-Tutorial-Code-2024S'
28+
if: github.repository == 'LearningOS/rCore-Tutorial-Code-2024A'
2929
runs-on: ubuntu-latest
3030
steps:
3131
- uses: actions/checkout@v1
3232
- name: Mirror + trigger CI
3333
uses: tkf2019/gitlab-mirror-and-ci-action@master
3434
with:
35-
args: "https://git.tsinghua.edu.cn/os-lab/2024s/public/rcore-tutorial-code-2024s"
35+
args: "https://git.tsinghua.edu.cn/os-lab/2024a/public/rcore-tutorial-code-2024a"
3636
env:
3737
GITLAB_HOSTNAME: "git.tsinghua.edu.cn"
38-
GITLAB_PROJECT_ID: "29091"
39-
GITLAB_PROJECT_NAME: "rcore-tutorial-code-2024s"
38+
GITLAB_PROJECT_ID: "34689"
39+
GITLAB_PROJECT_NAME: "rcore-tutorial-code-2024a"
4040
GITLAB_PROJECT_TOKEN: ${{secrets.GITLAB_PROJECT_TOKEN}}
4141
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

README.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
# rCore-Tutorial-Code-2024S
1+
# rCore-Tutorial-Code-2024A
22

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

7-
- Concise Manual: [rCore-Tutorial-Guide-2024S](https://LearningOS.github.io/rCore-Tutorial-Guide-2024S/)
7+
- Concise Manual: [rCore-Tutorial-Guide-2024A](https://LearningOS.github.io/rCore-Tutorial-Guide-2024A/)
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 2024S
13-
- [OS API docs of ch1](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch1/os/index.html)
14-
AND [OS API docs of ch2](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch2/os/index.html)
15-
- [OS API docs of ch3](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch3/os/index.html)
16-
AND [OS API docs of ch4](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch4/os/index.html)
17-
- [OS API docs of ch5](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch5/os/index.html)
18-
AND [OS API docs of ch6](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch6/os/index.html)
19-
- [OS API docs of ch7](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch7/os/index.html)
20-
AND [OS API docs of ch8](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch8/os/index.html)
21-
- [OS API docs of ch9](https://learningos.github.io/rCore-Tutorial-Code-2024S/ch9/os/index.html)
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)
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-2024S.git
32-
$ cd rCore-Tutorial-Code-2024S
33-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024S.git user
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
3434
$ cd os
3535
$ git checkout ch$ID
3636
# run OS in ch$ID
@@ -42,11 +42,11 @@ Notice: $ID is from [1-9]
4242

4343
```bash
4444
# setup build&run environment first
45-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024S.git
46-
$ cd rCore-Tutorial-Code-2024S
45+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Code-2024A.git
46+
$ cd rCore-Tutorial-Code-2024A
4747
$ rm -rf ci-user
48-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Checker-2024S.git ci-user
49-
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024S.git ci-user/user
48+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Checker-2024A.git ci-user
49+
$ git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024A.git ci-user/user
5050
$ git checkout ch$ID
5151
# check&grade OS in ch$ID with more tests
5252
$ cd ci-user && make test CHAPTER=$ID

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
22
profile = "minimal"
33
# use the nightly version of the last stable toolchain, see <https://forge.rust-lang.org/>
4-
channel = "nightly-2024-02-25"
4+
channel = "nightly-2024-05-02"
55
components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"]

0 commit comments

Comments
 (0)