Skip to content

Commit

Permalink
Update for 2025S
Browse files Browse the repository at this point in the history
  • Loading branch information
rcy17 committed Jan 24, 2025
1 parent 4f98cfb commit 2655b40
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/github-autotest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ jobs:
image: duskmoon/dev-env:ucore-ci
steps:
- uses: actions/checkout@v3
- run: git clone https://github.com/LearningOS/uCore-Tutorial-Checker-2024A.git ucore-tutorial-ci
- run: git clone https://github.com/LearningOS/uCore-Tutorial-Test-2024A.git ucore-tutorial-ci/workplace/user
- run: git clone https://github.com/LearningOS/uCore-Tutorial-Checker-2025S.git ucore-tutorial-ci
- run: git clone https://github.com/LearningOS/uCore-Tutorial-Test-2025S.git ucore-tutorial-ci/workplace/user
- name: run test
id: tester
# 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
run: cd ucore-tutorial-ci && make test passwd=${{ secrets.BASE_TEST_TOKEN }} CHAPTER=`echo ${GITHUB_REF##*/} | grep -oP 'ch\K[0-9]'`
# - name: end
# run: cat output.txt | grep "Test passed" | grep -oP "\d{1,}/\d{1,}" | xargs -i echo "points={}" >> $GITHUB_OUTPUT
# deploy:
# if: github.repository != 'LearningOS/uCore-Tutorial-Code-2024A'
# if: github.repository != 'LearningOS/uCore-Tutorial-Code-2025S'
# name: Deploy to pages
# needs: base-test
# runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gitlab-mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
- name: Mirror + trigger CI
uses: tkf2019/gitlab-mirror-and-ci-action@master
with:
args: "https://git.tsinghua.edu.cn/os-lab/2024a/public/ucore-tutorial-code-2024a"
args: "https://git.tsinghua.edu.cn/os-lab/2025S/public/ucore-tutorial-code-2025S"
env:
GITLAB_HOSTNAME: "git.tsinghua.edu.cn"
GITLAB_PROJECT_ID: "34735"
GITLAB_PROJECT_NAME: "ucore-tutorial-code-2024a"
GITLAB_PROJECT_NAME: "ucore-tutorial-code-2025S"
GITLAB_PROJECT_TOKEN: ${{secrets.GITLAB_PROJECT_TOKEN}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ stages:
test-code-job:
stage: test
script:
- git clone https://token:${uCoreCheckToken}@git.tsinghua.edu.cn/os-lab/2024a/ta/ucore-tutorial-checker-2024a.git ucore-tutorial-ci
- git clone https://token:${uCoreTestToken}@git.tsinghua.edu.cn/os-lab/2024a/public/ucore-tutorial-test-2024a.git ucore-tutorial-ci/workplace/user
- git clone https://token:${uCoreCheckToken}@git.tsinghua.edu.cn/os-lab/2025S/ta/ucore-tutorial-checker-2025S.git ucore-tutorial-ci
- git clone https://token:${uCoreTestToken}@git.tsinghua.edu.cn/os-lab/2025S/public/ucore-tutorial-test-2025S.git ucore-tutorial-ci/workplace/user
- cd ucore-tutorial-ci && make test CHAPTER=`echo $CI_COMMIT_REF_NAME | grep -oP 'ch\K[0-9]'`
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ Course project for THU-OS.

```bash
# GitHub 使用 https
git clone https://github.com/LearningOS/uCore-Tutorial-Test-2024A.git user
git clone https://github.com/LearningOS/uCore-Tutorial-Test-2025S.git user
# GitHub 使用 ssh
git clone git@github.com:LearningOS/uCore-Tutorial-Test-2024A.git user
git clone git@github.com:LearningOS/uCore-Tutorial-Test-2025S.git user
```

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

0 comments on commit 2655b40

Please sign in to comment.