2024S: build offline

Author: tkf2019

.github/workflows/build.yml

@@ -56,11 +56,11 @@ jobs:
     - name: Mirror + trigger CI
       uses: tkf2019/gitlab-mirror-and-ci-action@master
       with:
-        args: "https://git.tsinghua.edu.cn/os-lab/2024s/public/rcore-tutorial-code"
+        args: "https://git.tsinghua.edu.cn/os-lab/2024s/public/rcore-tutorial-code-2024s"
       env:
         GITLAB_HOSTNAME: "git.tsinghua.edu.cn"
         GITLAB_PROJECT_ID: "29091"
-        GITLAB_PROJECT_NAME: "rcore-tutorial-code"
+        GITLAB_PROJECT_NAME: "rcore-tutorial-code-2024s"
         GITLAB_PROJECT_TOKEN: ${{secrets.GITLAB_PROJECT_TOKEN}}
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
   deploy:

.gitlab-ci.yml

@@ -7,6 +7,8 @@ stages:
 test-code-job:
   stage: test
   script:
-    - git clone https://github.com/LearningOS/rCore-Tutorial-Checker-2024S.git ci-user
-    - git clone https://github.com/LearningOS/rCore-Tutorial-Test-2024S.git ci-user/user
-    - cd ci-user && make test CHAPTER=`echo $CI_COMMIT_REF_NAME | grep -oP 'ch\K[0-9]'` passwd=$BASE_TEST_TOKEN
+    - git clone https://token:${RCORE_CHECKER_REPO_READ_TOKEN_2024S}@git.tsinghua.edu.cn/os-lab/2024s/ta/rcore-tutorial-checker-2024s.git ci-user
+    - git clone https://token:${RCORE_TEST_REPO_READ_TOKEN_2024S}@git.tsinghua.edu.cn/os-lab/2024s/public/rcore-tutorial-test-2024s.git ci-user/user
+    - cp -r $HOME/os-vendor os/vendor
+    - cp -r $HOME/user-vendor ci-user/user/vendor
+    - cd ci-user && make test CHAPTER=`echo $CI_COMMIT_REF_NAME | grep -oP 'ch\K[0-9]'` passwd=$BASE_TEST_TOKEN OFFLINE=1

Dockerfile

@@ -73,13 +73,18 @@ RUN rustup --version && \
     cargo --version && \
     rustc --version
 
-# 3. Build env for labs
-# See os1/Makefile `env:` for example.
-# This avoids having to wait for these steps each time using a new container.
-RUN rustup target add riscv64gc-unknown-none-elf && \
-    cargo install cargo-binutils --vers ~0.2 && \
-    rustup component add rust-src && \
-    rustup component add llvm-tools-preview
+# 2.3 Env
+RUN cargo install cargo-binutils; \
+    rustup target add riscv64gc-unknown-none-elf; \
+	rustup component add rust-src; \
+	rustup component add llvm-tools-preview; \
+	rustup component add rustfmt; \
+	rustup component add clippy;
+
+# 3. Cargo vendor
+WORKDIR ${HOME}
+COPY os/vendor ./os-vendor
+COPY user/vendor ./user-vendor
 
 # Ready to go
 WORKDIR ${HOME}

os/Cargo.toml

@@ -11,7 +11,7 @@ bitflags = "1.2.1"
 buddy_system_allocator = "0.6"
 lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
 log = "0.4"
-riscv = { git = "https://gitee.com/rcore-os/riscv", features = ["inline-asm"] }
+riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }
 xmas-elf = "0.7.0"
 virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "4ee80e5" }
 easy-fs = { path = "../easy-fs" }

os/Makefile

@@ -6,6 +6,7 @@ KERNEL_BIN := $(KERNEL_ELF).bin
 DISASM_TMP := target/$(TARGET)/$(MODE)/asm
 FS_IMG := ../user/target/$(TARGET)/$(MODE)/fs.img
 APPS := ../user/src/bin/*
+OFFLINE :=
 
 # BOARD
 BOARD := qemu
@@ -37,10 +38,12 @@ TEST ?=
 build: env $(KERNEL_BIN) fs-img 
 
 env:
+ifeq ($(OFFLINE),)
 	(rustup target list | grep "riscv64gc-unknown-none-elf (installed)") || rustup target add $(TARGET)
 	cargo install cargo-binutils
 	rustup component add rust-src
 	rustup component add llvm-tools-preview
+endif
 
 $(KERNEL_BIN): kernel
 	@$(OBJCOPY) $(KERNEL_ELF) --strip-all -O binary $@