Update 2024A

LearningOS · Sep 15, 2024 · 6e025bd · 6e025bd
1 parent d8cd97d
commit 6e025bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/github-autotest.yml b/.github/workflows/github-autotest.yml
@@ -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-2024S.git ucore-tutorial-ci
-      - run: git clone https://github.com/LearningOS/uCore-Tutorial-Test-2024S.git ucore-tutorial-ci/workplace/user
+      - 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
       - 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-2024S'
+  #   if: github.repository != 'LearningOS/uCore-Tutorial-Code-2024A'
   #   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
@@ -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/2024s/public/ucore-tutorial-code-2024s"
+        args: "https://git.tsinghua.edu.cn/os-lab/2024a/public/ucore-tutorial-code-2024a"
       env:
         GITLAB_HOSTNAME: "git.tsinghua.edu.cn"
-        GITLAB_PROJECT_ID: "29092"
-        GITLAB_PROJECT_NAME: "ucore-tutorial-code-2024s"
+        GITLAB_PROJECT_ID: "34735"
+        GITLAB_PROJECT_NAME: "ucore-tutorial-code-2024a"
         GITLAB_PROJECT_TOKEN: ${{secrets.GITLAB_PROJECT_TOKEN}}
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,6 +7,6 @@ stages:
 test-code-job:
   stage: test
   script:
-    - git clone https://token:${UCORE_CHECKER_REPO_READ_TOKEN_2024S}@git.tsinghua.edu.cn/os-lab/2024s/ta/ucore-tutorial-checker-2024s.git ucore-tutorial-ci
-    - git clone https://token:${UCORE_TEST_REPO_READ_TOKEN_2024S}@git.tsinghua.edu.cn/os-lab/2024s/public/ucore-tutorial-test-2024s.git ucore-tutorial-ci/workplace/user
+    - 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
     - cd ucore-tutorial-ci && make test CHAPTER=`echo $CI_COMMIT_REF_NAME | grep -oP 'ch\K[0-9]'`