Merge branch 'main' into 312555022

SQLab · Mar 7, 2024 · de2d968 · de2d968
2 parents 00de90b + 95502c6
commit de2d968
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/lab2/main.js b/lab2/main.js
@@ -12,7 +12,6 @@ class MailSystem {
     send(name, context) {
         console.log('--send mail to ' + name + '--');
         // Interact with mail system and send mail
-        sleep(1000);
         // random success or failure
         const success = Math.random() > 0.5;
         if (success) {
@@ -74,4 +73,9 @@ class Application {
 // app.selectNextPerson();
 // app.selectNextPerson();
 // app.selectNextPerson();
-// app.notifySelected();
+// app.notifySelected();
+
+module.exports = {
+    Application,
+    MailSystem,
+};
diff --git a/scripts/rebase-all.sh b/scripts/rebase-all.sh
@@ -12,18 +12,12 @@ for branch in $(git branch -r | grep -v HEAD); do
             echo "Checkout failed for branch $branch"
             exit 1
         fi
-        git pull origin "$branch"
-        if [[ $? -ne 0 ]]; then
-            echo "Pull failed for branch $branch"
-            exit 1
-        fi
         git rebase main
         if [[ $? -ne 0 ]]; then
             echo "Rebase failed for branch $branch"
             exit 1
         fi
-        git push origin "$branch"
     fi
 done
 
-git checkout main
+git checkout main