2023A

Author: 田凯夫

.github/workflows/github-autotest.yml

@@ -6,39 +6,39 @@ on:
 jobs:
   base-test:
     runs-on: ubuntu-latest
-    outputs:
-      points: ${{ steps.end.outputs.points}}
+    # outputs:
+    #   points: ${{ steps.end.outputs.points}}
     container:
         image: duskmoon/dev-env:ucore-ci
     steps:
       - uses: actions/checkout@v3
-      - run: git clone https://github.com/LearningOS/uCore-Tutorial-Checker-2023S.git ucore-tutorial-ci
-      - run: git clone https://github.com/LearningOS/uCore-Tutorial-Test-2023S.git ucore-tutorial-ci/workplace/user
+      - run: git clone https://github.com/LearningOS/uCore-Tutorial-Checker-2023A.git ucore-tutorial-ci
+      - run: git clone https://github.com/LearningOS/uCore-Tutorial-Test-2023A.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]'` > ../output.txt && cat ../output.txt
-      - name: end
-        id: 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-2023S'
-    name: Deploy to pages
-    needs: base-test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        continue-on-error: true
-        with:
-          ref: 'gh-pages'
-      - name: Save Log File
-        uses: yfblock/multi-rank-log@main
-        with:
-          points: ${{ needs.base-test.outputs.points }}
-      - name: GitHub Pages
-        uses: crazy-max/ghaction-github-pages@v3
-        with:
-          target_branch: gh-pages
-          build_dir: ./public
-          keep_history: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # 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-2023A'
+  #   name: Deploy to pages
+  #   needs: base-test
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #       continue-on-error: true
+  #       with:
+  #         ref: 'gh-pages'
+  #     - name: Save Log File
+  #       uses: yfblock/multi-rank-log@main
+  #       with:
+  #         points: ${{ needs.base-test.outputs.points }}
+  #     - name: GitHub Pages
+  #       uses: crazy-max/ghaction-github-pages@v3
+  #       with:
+  #         target_branch: gh-pages
+  #         build_dir: ./public
+  #         keep_history: true
+  #       env:
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gitlab-mirror.yml

@@ -9,14 +9,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Mirror + trigger CI
-      uses: Gallium70/gitlab-mirror-and-ci-action@master
+      uses: tkf2019/gitlab-mirror-and-ci-action@master
       with:
-        args: "https://git.tsinghua.edu.cn/os-lab/2023s/public/ucore-tutorial-code-2023s"
+        args: "https://git.tsinghua.edu.cn/os-lab/2023a/public/ucore-tutorial-code-2023a"
       env:
         GITLAB_HOSTNAME: "git.tsinghua.edu.cn"
-        GITLAB_PROJECT_ID: "20789"
-        GITLAB_PROJECT_NAME: "ucore-tutorial-code-2023s"
+        GITLAB_PROJECT_ID: "26336"
+        GITLAB_PROJECT_NAME: "ucore-tutorial-code-2023a"
         GITLAB_PROJECT_TOKEN: ${{secrets.GITLAB_PROJECT_TOKEN}}
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitlab-ci.yml

@@ -7,6 +7,6 @@ stages:
 test-code-job:
   stage: test
   script:
-    - git clone https://token:${UCORE_CHECKER_REPO_READ_TOKEN_2023S}@git.tsinghua.edu.cn/os-lab/2023s/ta/ucore-tutorial-checker-2023s.git ucore-tutorial-ci
-    - git clone https://token:${UCORE_TEST_REPO_READ_TOKEN_2023S}@git.tsinghua.edu.cn/os-lab/2023s/public/ucore-tutorial-test-2023s.git ucore-tutorial-ci/workplace/user
+    - git clone https://token:${UCORE_CHECKER_REPO_READ_TOKEN_2023A}@git.tsinghua.edu.cn/os-lab/2023a/ta/ucore-tutorial-checker-2023a.git ucore-tutorial-ci
+    - git clone https://token:${UCORE_TEST_REPO_READ_TOKEN_2023A}@git.tsinghua.edu.cn/os-lab/2023a/public/ucore-tutorial-test-2023a.git ucore-tutorial-ci/workplace/user
     - cd ucore-tutorial-ci && make test CHAPTER=`echo $CI_COMMIT_REF_NAME | grep -oP 'ch\K[0-9]'`

README.md

@@ -16,13 +16,13 @@ Course project for THU-OS.
 
 ```bash
 # 清华 git 使用 https
-git clone https://git.tsinghua.edu.cn/os-lab/public/ucore-tutorial-test-2022a.git user
+git clone https://git.tsinghua.edu.cn/os-lab/2023a/public/ucore-tutorial-test-2023a.git user
 # 清华 git 使用 ssh
-git clone [email protected]:os-lab/public/ucore-tutorial-test-2022a.git user
+git clone [email protected]:os-lab/2023a/public/ucore-tutorial-test-2023a.git user
 # GitHub 使用 https
-git clone https://github.com/LearningOS/uCore-Tutorial-Test-2022A.git user
+git clone https://github.com/LearningOS/uCore-Tutorial-Test-2023A.git user
 # GitHub 使用 ssh
-git clone [email protected]:LearningOS/uCore-Tutorial-Test-2022A.git user
+git clone [email protected]:LearningOS/uCore-Tutorial-Test-2023A.git user
 ```
 
 注意：`user` 已添加至 `.gitignore`，你无需将其提交，ci 也不会使用它