Exclude dev and run from clear early flag

VNOI-Admin · Jan 18, 2024 · de7c73f · de7c73f
1 parent 89d15f3
commit de7c73f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -94,6 +94,7 @@ jobs:
         with:
           host: ${{ secrets.SCP_HOST }}
           username: ${{ secrets.SCP_USERNAME }}
-          password: ${{ secrets.SCP_PASSWORD }}
+          key: ${{ secrets.SCP_KEY }}
+          port: 22
           source: live-build/contestant.iso
           target: /home/${{ secrets.SERVER_USERNAME }}/contestant.iso
diff --git a/build.sh b/build.sh
@@ -153,8 +153,8 @@ icpc_build() {
     log "Done"
 
     log "Unmounting /dev and /run from chroot"
-    umount -f $CHROOT/dev
-    umount -f $CHROOT/run
+    umount $CHROOT/dev
+    umount $CHROOT/run
     log "Done"
 
     rm -rf $ICPC_ISO_FILENAME
@@ -199,7 +199,11 @@ icpc_image_build() {
 
     if [ $CLEAR_EARLY = true ]; then
         log "Clearing early to free up space"
-        rm -rf $CHROOT
+        for i in $(ls $CHROOT); do
+            if [ ! $i = "dev" ] && [ ! $i = "run" ]; then
+                rm -rf $CHROOT/$i
+            fi
+        done
         log "Done"
     fi