From 2655b40293140b51197b19e9eeb714a5c6eb8f4a Mon Sep 17 00:00:00 2001 From: holder Date: Fri, 24 Jan 2025 15:56:49 +0800 Subject: [PATCH] Update for 2025S --- .github/workflows/github-autotest.yml | 6 +++--- .github/workflows/gitlab-mirror.yml | 4 ++-- .gitlab-ci.yml | 4 ++-- README.md | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/github-autotest.yml b/.github/workflows/github-autotest.yml index e8c2340..5218b54 100644 --- a/.github/workflows/github-autotest.yml +++ b/.github/workflows/github-autotest.yml @@ -12,8 +12,8 @@ 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 @@ -21,7 +21,7 @@ jobs: # - 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 diff --git a/.github/workflows/gitlab-mirror.yml b/.github/workflows/gitlab-mirror.yml index e160f58..34c3b34 100644 --- a/.github/workflows/gitlab-mirror.yml +++ b/.github/workflows/gitlab-mirror.yml @@ -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}} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4c6dc5..59df799 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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]'` diff --git a/README.md b/README.md index 8c7fcb2..53c2d2c 100644 --- a/README.md +++ b/README.md @@ -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 也不会使用它 \ No newline at end of file