From 53e4a2b7f2ded503c89028a6cff5abe78da45896 Mon Sep 17 00:00:00 2001
From: James Knee <jknee@bu.edu>
Date: Mon, 2 Dec 2024 17:40:43 -0500
Subject: [PATCH 1/2] removed requirement for previous labs

---
 ci_cd/lab0.yml | 8 --------
 ci_cd/lab1.yml | 8 --------
 ci_cd/lab2.yml | 7 -------
 ci_cd/lab3.yml | 7 -------
 ci_cd/lab4.yml | 7 -------
 ci_cd/lab5.yml | 7 -------
 6 files changed, 44 deletions(-)

diff --git a/ci_cd/lab0.yml b/ci_cd/lab0.yml
index 10b3740..b5a435a 100644
--- a/ci_cd/lab0.yml
+++ b/ci_cd/lab0.yml
@@ -9,14 +9,6 @@ prebuild_lab_0:
         exit 1;
       fi
       
-      # Check if lab-1.cpp has been merged into master
-      git fetch origin master  # Fetch the latest master branch
-      if git ls-tree -r origin/master --name-only | grep -q 'lab-1.cpp'; then
-        echo "Lab -1 complete";
-      else
-        echo "Please have lab -1 merged first";
-        exit 1;
-      fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_0
   artifacts:
     paths:
diff --git a/ci_cd/lab1.yml b/ci_cd/lab1.yml
index 71ebb3b..394e5cd 100644
--- a/ci_cd/lab1.yml
+++ b/ci_cd/lab1.yml
@@ -11,14 +11,6 @@ prebuild_lab_1:
         exit 1;
       fi
       
-      # Check if lab0.cpp has been merged into master
-      git fetch origin master  # Fetch the latest master branch
-      if git ls-tree -r origin/master --name-only | grep -q 'lab0.cpp'; then
-        echo "Lab 0 complete";
-      else
-        echo "Please have lab 0 merged first";
-        exit 1;
-      fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_1
   artifacts:
     paths:
diff --git a/ci_cd/lab2.yml b/ci_cd/lab2.yml
index 56d2ec4..8c26cb2 100644
--- a/ci_cd/lab2.yml
+++ b/ci_cd/lab2.yml
@@ -18,13 +18,6 @@ prebuild_lab_2:
         exit 1;
       fi
 
-      # Check if lab1.cpp has been merged into master
-      if git ls-tree -r origin/master --name-only | grep -q 'lab1.cpp'; then
-        echo "Lab 1 complete";
-      else
-        echo "Please have lab 1 merged first";
-        exit 1;
-      fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_2
   artifacts:
     paths:
diff --git a/ci_cd/lab3.yml b/ci_cd/lab3.yml
index b847684..ffd8bbb 100644
--- a/ci_cd/lab3.yml
+++ b/ci_cd/lab3.yml
@@ -19,13 +19,6 @@ prebuild_lab_3:
         exit 1;
       fi
       
-      # Check if lab2.cpp has been merged into master
-      if git ls-tree -r origin/master --name-only | grep -q 'lab2.cpp'; then
-        echo "Lab 2 complete";
-      else
-        echo "Please have lab 2 merged first";
-        exit 1;
-      fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_3
   artifacts:
     paths:
diff --git a/ci_cd/lab4.yml b/ci_cd/lab4.yml
index 1626a22..67ae865 100644
--- a/ci_cd/lab4.yml
+++ b/ci_cd/lab4.yml
@@ -19,13 +19,6 @@ prebuild_lab_4:
         exit 1;
       fi
       
-      # Check if lab3.cpp has been merged into master
-      if git ls-tree -r origin/master --name-only | grep -q 'lab3.cpp'; then
-        echo "Lab 3 complete";
-      else
-        echo "Please have lab 3 merged first";
-        exit 1;
-      fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_4
   artifacts:
     paths:
diff --git a/ci_cd/lab5.yml b/ci_cd/lab5.yml
index 0fa1b5a..072d5f0 100644
--- a/ci_cd/lab5.yml
+++ b/ci_cd/lab5.yml
@@ -19,13 +19,6 @@ prebuild_lab_5:
         exit 1;
       fi
       
-      # Check if lab4.cpp has been merged into master
-      if git ls-tree -r origin/master --name-only | grep -q 'lab4.cpp'; then
-        echo "Lab 4 complete";
-      else
-        echo "Please have lab 4 merged first";
-        exit 1;
-      fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_5
   artifacts:
     paths:
-- 
GitLab


From be407e8d5c2a6b8e5cdf31b08e8615c38f25b810 Mon Sep 17 00:00:00 2001
From: James Knee <jknee@bu.edu>
Date: Mon, 2 Dec 2024 17:51:50 -0500
Subject: [PATCH 2/2] commented out

---
 ci_cd/lab0.yml | 8 ++++++++
 ci_cd/lab1.yml | 8 ++++++++
 ci_cd/lab2.yml | 7 +++++++
 ci_cd/lab3.yml | 7 +++++++
 ci_cd/lab4.yml | 7 +++++++
 ci_cd/lab5.yml | 7 +++++++
 6 files changed, 44 insertions(+)

diff --git a/ci_cd/lab0.yml b/ci_cd/lab0.yml
index b5a435a..90cbc10 100644
--- a/ci_cd/lab0.yml
+++ b/ci_cd/lab0.yml
@@ -9,6 +9,14 @@ prebuild_lab_0:
         exit 1;
       fi
       
+      # Check if lab-1.cpp has been merged into master
+      # git fetch origin master  # Fetch the latest master branch
+      # if git ls-tree -r origin/master --name-only | grep -q 'lab-1.cpp'; then
+      #   echo "Lab -1 complete";
+      # else
+      #   echo "Please have lab -1 merged first";
+      #   exit 1;
+      # fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_0
   artifacts:
     paths:
diff --git a/ci_cd/lab1.yml b/ci_cd/lab1.yml
index 394e5cd..aba5103 100644
--- a/ci_cd/lab1.yml
+++ b/ci_cd/lab1.yml
@@ -11,6 +11,14 @@ prebuild_lab_1:
         exit 1;
       fi
       
+      # Check if lab0.cpp has been merged into master
+      # git fetch origin master  # Fetch the latest master branch
+      # if git ls-tree -r origin/master --name-only | grep -q 'lab0.cpp'; then
+      #   echo "Lab 0 complete";
+      # else
+      #   echo "Please have lab 0 merged first";
+      #   exit 1;
+      # fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_1
   artifacts:
     paths:
diff --git a/ci_cd/lab2.yml b/ci_cd/lab2.yml
index 8c26cb2..0f906a0 100644
--- a/ci_cd/lab2.yml
+++ b/ci_cd/lab2.yml
@@ -18,6 +18,13 @@ prebuild_lab_2:
         exit 1;
       fi
 
+      # Check if lab1.cpp has been merged into master
+      # if git ls-tree -r origin/master --name-only | grep -q 'lab1.cpp'; then
+      #   echo "Lab 1 complete";
+      # else
+      #   echo "Please have lab 1 merged first";
+      #   exit 1;
+      # fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_2
   artifacts:
     paths:
diff --git a/ci_cd/lab3.yml b/ci_cd/lab3.yml
index ffd8bbb..63eebde 100644
--- a/ci_cd/lab3.yml
+++ b/ci_cd/lab3.yml
@@ -19,6 +19,13 @@ prebuild_lab_3:
         exit 1;
       fi
       
+      # Check if lab2.cpp has been merged into master
+      # if git ls-tree -r origin/master --name-only | grep -q 'lab2.cpp'; then
+      #   echo "Lab 2 complete";
+      # else
+      #   echo "Please have lab 2 merged first";
+      #   exit 1;
+      # fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_3
   artifacts:
     paths:
diff --git a/ci_cd/lab4.yml b/ci_cd/lab4.yml
index 67ae865..75e0718 100644
--- a/ci_cd/lab4.yml
+++ b/ci_cd/lab4.yml
@@ -19,6 +19,13 @@ prebuild_lab_4:
         exit 1;
       fi
       
+      # Check if lab3.cpp has been merged into master
+      # if git ls-tree -r origin/master --name-only | grep -q 'lab3.cpp'; then
+      #   echo "Lab 3 complete";
+      # else
+      #   echo "Please have lab 3 merged first";
+      #   exit 1;
+      # fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_4
   artifacts:
     paths:
diff --git a/ci_cd/lab5.yml b/ci_cd/lab5.yml
index 072d5f0..834c003 100644
--- a/ci_cd/lab5.yml
+++ b/ci_cd/lab5.yml
@@ -19,6 +19,13 @@ prebuild_lab_5:
         exit 1;
       fi
       
+      # Check if lab4.cpp has been merged into master
+      # if git ls-tree -r origin/master --name-only | grep -q 'lab4.cpp'; then
+      #   echo "Lab 4 complete";
+      # else
+      #   echo "Please have lab 4 merged first";
+      #   exit 1;
+      # fi
     - git clone https://agile.bu.edu/gitlab/configs/ec327/lab-configs/current.git base_5
   artifacts:
     paths:
-- 
GitLab