From 0b534c5c07634136bb8edef2294399e872d19011 Mon Sep 17 00:00:00 2001
From: Yu Chen <yuchen@mail.tsinghua.edu.cn>
Date: Tue, 28 Jun 2022 12:21:05 +0800
Subject: [PATCH] update: setupclassroom

---
 Makefile                                     | 29 +++++++++++---------
 {.github/workflows => scripts}/classroom.yml |  3 --
 2 files changed, 16 insertions(+), 16 deletions(-)
 rename {.github/workflows => scripts}/classroom.yml (92%)

diff --git a/Makefile b/Makefile
index a3958a1..3e3dcd7 100644
--- a/Makefile
+++ b/Makefile
@@ -69,17 +69,20 @@ docker:
 build_docker: 
 	docker build -t ${DOCKER_NAME} .
 
-setupenv:
-	sudo apt-get update
-	sudo apt-get install -y curl wget autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc xz-utils zlib1g-dev libexpat-dev pkg-config  libglib2.0-dev libpixman-1-dev git tmux python3
-	RUSTUP='$HOME/rustup.sh'
-	cd $HOME
-	curl https://sh.rustup.rs -sSf > $RUSTUP && chmod +x $RUSTUP
-	$RUSTUP -y --default-toolchain nightly-2022-04-11 --profile minimal
-	cd $HOME
-	wget https://download.qemu.org/qemu-7.0.0.tar.xz
-	tar xvJf qemu-7.0.0.tar.xz
-	cd qemu-7.0.0
-	./configure --target-list=riscv64-softmmu
-	make install
+setupclassroom:
+	cp scripts/classroom.yml .github/workflows/classroom.yml
+	git add  .github/workflows/classroom.yml
+	git commit -m"update classroom.yml for classroom CI test"
+	git push	
+# setupenv:
+# 	sudo apt-get update
+# 	sudo apt-get install -y curl wget autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc xz-utils zlib1g-dev libexpat-dev pkg-config  libglib2.0-dev libpixman-1-dev git tmux python3
+# 	curl https://sh.rustup.rs -sSf > $RUSTUP && chmod +x $RUSTUP
+# 	$RUSTUP -y --default-toolchain nightly-2022-04-11 --profile minimal
+# 	cd $HOME
+# 	wget https://download.qemu.org/qemu-7.0.0.tar.xz
+# 	tar xvJf qemu-7.0.0.tar.xz
+# 	cd qemu-7.0.0
+# 	./configure --target-list=riscv64-softmmu
+# 	make install
 
diff --git a/.github/workflows/classroom.yml b/scripts/classroom.yml
similarity index 92%
rename from .github/workflows/classroom.yml
rename to scripts/classroom.yml
index c678d68..4f2194f 100644
--- a/.github/workflows/classroom.yml
+++ b/scripts/classroom.yml
@@ -44,7 +44,4 @@ jobs:
           fi
           sudo make install
           qemu-system-riscv64 --version
-      - name: Run usertests
-        run: cd os && make run TEST=1
-        timeout-minutes: 10
       - uses: education/autograding@v1