Skip to content

Commit 2006bec

Browse files
committed
2024S
1 parent 7dc0336 commit 2006bec

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

.github/workflows/github-autotest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
image: duskmoon/dev-env:ucore-ci
1313
steps:
1414
- uses: actions/checkout@v3
15-
- run: git clone https://github.com/LearningOS/uCore-Tutorial-Checker-2023A.git ucore-tutorial-ci
16-
- run: git clone https://github.com/LearningOS/uCore-Tutorial-Test-2023A.git ucore-tutorial-ci/workplace/user
15+
- run: git clone https://github.com/LearningOS/uCore-Tutorial-Checker-2024S.git ucore-tutorial-ci
16+
- run: git clone https://github.com/LearningOS/uCore-Tutorial-Test-2024S.git ucore-tutorial-ci/workplace/user
1717
- name: run test
1818
id: tester
1919
# run: cd ucore-tutorial-ci && make test passwd=${{ secrets.BASE_TEST_TOKEN }} CHAPTER=`echo ${GITHUB_REF##*/} | grep -oP 'ch\K[0-9]'` | tee ../output.txt
@@ -22,7 +22,7 @@ jobs:
2222
# id: end
2323
# run: cat output.txt | grep "Test passed" | grep -oP "\d{1,}/\d{1,}" | xargs -i echo "points={}" >> $GITHUB_OUTPUT
2424
# deploy:
25-
# if: github.repository != 'LearningOS/uCore-Tutorial-Code-2023A'
25+
# if: github.repository != 'LearningOS/uCore-Tutorial-Code-2024S'
2626
# name: Deploy to pages
2727
# needs: base-test
2828
# runs-on: ubuntu-latest

.github/workflows/gitlab-mirror.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
- name: Mirror + trigger CI
1414
uses: tkf2019/gitlab-mirror-and-ci-action@master
1515
with:
16-
args: "https://git.tsinghua.edu.cn/os-lab/2023a/public/ucore-tutorial-code-2023a"
16+
args: "https://git.tsinghua.edu.cn/os-lab/2024s/public/ucore-tutorial-code"
1717
env:
1818
GITLAB_HOSTNAME: "git.tsinghua.edu.cn"
19-
GITLAB_PROJECT_ID: "26336"
20-
GITLAB_PROJECT_NAME: "ucore-tutorial-code-2023a"
19+
GITLAB_PROJECT_ID: "29092"
20+
GITLAB_PROJECT_NAME: "ucore-tutorial-code"
2121
GITLAB_PROJECT_TOKEN: ${{secrets.GITLAB_PROJECT_TOKEN}}
2222
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
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://github.com/LearningOS/uCore-Tutorial-Checker-2023A.git ucore-tutorial-ci
11-
- git clone https://github.com/LearningOS/uCore-Tutorial-Test-2023A.git ucore-tutorial-ci/workplace/user
10+
- git clone https://github.com/LearningOS/uCore-Tutorial-Checker-2024S.git ucore-tutorial-ci
11+
- git clone https://github.com/LearningOS/uCore-Tutorial-Test-2024S.git ucore-tutorial-ci/workplace/user
1212
- cd ucore-tutorial-ci && make test CHAPTER=`echo $CI_COMMIT_REF_NAME | grep -oP 'ch\K[0-9]'`

README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,10 @@ Course project for THU-OS.
1515
在本地开发并测试时,需要拉取 uCore-Tutorial-Test-2022A 到 `user` 文件夹。你可以根据网络情况和个人偏好选择下列一项执行:
1616

1717
```bash
18-
# 清华 git 使用 https
19-
git clone https://git.tsinghua.edu.cn/os-lab/2023a/public/ucore-tutorial-test-2023a.git user
20-
# 清华 git 使用 ssh
21-
git clone [email protected]:os-lab/2023a/public/ucore-tutorial-test-2023a.git user
2218
# GitHub 使用 https
23-
git clone https://github.com/LearningOS/uCore-Tutorial-Test-2023A.git user
19+
git clone https://github.com/LearningOS/uCore-Tutorial-Test-2024S.git user
2420
# GitHub 使用 ssh
25-
git clone [email protected]:LearningOS/uCore-Tutorial-Test-2023A.git user
21+
git clone [email protected]:LearningOS/uCore-Tutorial-Test-2024S.git user
2622
```
2723

2824
注意:`user` 已添加至 `.gitignore`,你无需将其提交,ci 也不会使用它

0 commit comments

Comments
 (0)