From 15974caecae3cec0201a305cd07cf8f8fa6dd457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nya=20=CE=9Elimu?= <info@elimu.ai>
Date: Wed, 15 Jan 2025 19:09:38 +0000
Subject: [PATCH 1/4] [maven-release-plugin] prepare release webapp-2.4.64

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a0101488b..822ed0d10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>ai.elimu</groupId>
     <artifactId>webapp</artifactId>
     <packaging>war</packaging>
-    <version>2.4.64-SNAPSHOT</version>
+    <version>2.4.64</version>
 
     <properties>
         <java.version>17</java.version>
@@ -138,7 +138,7 @@
         <connection>scm:git:git@github.com:elimu-ai/webapp.git</connection>
         <developerConnection>scm:git:https://github.com/elimu-ai/webapp.git</developerConnection>
         <url>https://github.com/elimu-ai/webapp</url>
-        <tag>HEAD</tag>
+        <tag>webapp-2.4.64</tag>
     </scm>
     <distributionManagement>
         <repository>

From 0caa7fac3f60c71075da03aae5e409ce3a546e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nya=20=CE=9Elimu?= <info@elimu.ai>
Date: Wed, 15 Jan 2025 19:09:39 +0000
Subject: [PATCH 2/4] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 822ed0d10..53d4f2bc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>ai.elimu</groupId>
     <artifactId>webapp</artifactId>
     <packaging>war</packaging>
-    <version>2.4.64</version>
+    <version>2.4.65-SNAPSHOT</version>
 
     <properties>
         <java.version>17</java.version>
@@ -138,7 +138,7 @@
         <connection>scm:git:git@github.com:elimu-ai/webapp.git</connection>
         <developerConnection>scm:git:https://github.com/elimu-ai/webapp.git</developerConnection>
         <url>https://github.com/elimu-ai/webapp</url>
-        <tag>webapp-2.4.64</tag>
+        <tag>HEAD</tag>
     </scm>
     <distributionManagement>
         <repository>

From 81ffa025db090540fa44da4ec1893d00575b4b5f Mon Sep 17 00:00:00 2001
From: "Jo G." <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 22 Jan 2025 15:50:22 +0700
Subject: [PATCH 3/4] test: disable video learning events page

#1894
---
 .../java/selenium/analytics/VideoLearningEventsPageTest.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/selenium/analytics/VideoLearningEventsPageTest.java b/src/test/java/selenium/analytics/VideoLearningEventsPageTest.java
index 1fb1b449d..64fc04107 100644
--- a/src/test/java/selenium/analytics/VideoLearningEventsPageTest.java
+++ b/src/test/java/selenium/analytics/VideoLearningEventsPageTest.java
@@ -4,6 +4,7 @@
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
@@ -43,6 +44,7 @@ public void tearDown() {
         driver.quit();
     }
 
+    @Disabled("Disabled until the event-simulator bug has been fixed")
     @Test
     public void testVideoLearningEventsPage() {
         logger.info("testVideoLearningEventsPage");

From e9f1cb28e1ecbcb1617c4067f601e295dc56d6b8 Mon Sep 17 00:00:00 2001
From: "Jo G." <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 22 Jan 2025 15:54:32 +0700
Subject: [PATCH 4/4] test: skip tagalog until jetty has been upgraded to
 version 11

#1797
---
 .github/workflows/maven-regression-test-rest.yml | 15 +--------------
 .github/workflows/maven-regression-test-ui.yml   | 15 +--------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/maven-regression-test-rest.yml b/.github/workflows/maven-regression-test-rest.yml
index 66c7a6c2a..f182b9b48 100644
--- a/.github/workflows/maven-regression-test-rest.yml
+++ b/.github/workflows/maven-regression-test-rest.yml
@@ -18,22 +18,9 @@ jobs:
           cache: maven
       - run: mvn clean
       - run: mvn verify -P regression-test-rest -D base.url=http://eng.elimu.ai
-  
-  test_rest_TGL:
-    needs: test_rest_ENG
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 17
-          cache: maven
-      - run: mvn clean
-      - run: mvn verify -P regression-test-rest -D base.url=http://tgl.elimu.ai
 
   test_rest_HIN:
-    needs: test_rest_TGL
+    needs: test_rest_ENG
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/maven-regression-test-ui.yml b/.github/workflows/maven-regression-test-ui.yml
index 53c2e42dd..06e2868d9 100644
--- a/.github/workflows/maven-regression-test-ui.yml
+++ b/.github/workflows/maven-regression-test-ui.yml
@@ -18,22 +18,9 @@ jobs:
           cache: maven
       - run: mvn clean
       - run: mvn verify -P regression-test-ui -D headless=true -D base.url=http://eng.elimu.ai
-  
-  test_ui_TGL:
-    needs: test_ui_ENG
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 17
-          cache: maven
-      - run: mvn clean
-      - run: mvn verify -P regression-test-ui -D headless=true -D base.url=http://tgl.elimu.ai
 
   test_ui_HIN:
-    needs: test_ui_TGL
+    needs: test_ui_ENG
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4