From 03dfc4265d753855c56801939b86d91b1e61e526 Mon Sep 17 00:00:00 2001 From: jo-elimu <1451036+jo-elimu@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:26:25 +0700 Subject: [PATCH 1/6] test(rest): add regression testing to github action closes #1768 --- .github/workflows/maven-regression-test.yml | 33 +++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/maven-regression-test.yml diff --git a/.github/workflows/maven-regression-test.yml b/.github/workflows/maven-regression-test.yml new file mode 100644 index 000000000..df914a388 --- /dev/null +++ b/.github/workflows/maven-regression-test.yml @@ -0,0 +1,33 @@ +name: Maven Regression Test + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + regression_test_hindi: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 11 + cache: maven + - run: mvn clean + - run: mvn verify -P regression-testing-rest -D base.url=http://hin.elimu.ai + + regression_test_tagalog: + needs: regression_test_hindi + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 11 + cache: maven + - run: mvn clean + - run: mvn verify -P regression-testing-rest -D base.url=http://tgl.elimu.ai From 3a4a1d0eab9edd7bf3602c54cfbf50c88f5f1c89 Mon Sep 17 00:00:00 2001 From: "Jo G." <1451036+jo-elimu@users.noreply.github.com> Date: Sun, 28 Jul 2024 21:50:48 +0700 Subject: [PATCH 2/6] docs(deploy): add deployment script refs #1792 --- .../centos-stream-9/~/.elimu-ai/deploy-webapp.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/config/centos-stream-9/~/.elimu-ai/deploy-webapp.sh diff --git a/src/main/config/centos-stream-9/~/.elimu-ai/deploy-webapp.sh b/src/main/config/centos-stream-9/~/.elimu-ai/deploy-webapp.sh new file mode 100644 index 000000000..7a776f49c --- /dev/null +++ b/src/main/config/centos-stream-9/~/.elimu-ai/deploy-webapp.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +VERSION=$1 +echo "VERSION: $VERSION" + +echo "Stopping Jetty..." +systemctl stop jetty + +WAR_FILE_URL=https://jitpack.io/com/github/elimu-ai/webapp/webapp-$VERSION/webapp-webapp-$VERSION.war +echo "Downloading WAR file from $WAR_FILE_URL" +wget -O /opt/jetty-base/webapps/webapp.war $WAR_FILE_URL + +echo "Starting Jetty" +systemctl start jetty From 25e8b60387a3c15342c9059249e7565a2981d382 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 22:05:12 +0000 Subject: [PATCH 3/6] chore(deps-dev): bump org.mockito:mockito-core from 4.11.0 to 5.12.0 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 4.11.0 to 5.12.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.11.0...v5.12.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c49e2d363..790250250 100644 --- a/pom.xml +++ b/pom.xml @@ -563,7 +563,7 @@ org.mockito mockito-core - 4.11.0 + 5.12.0 test From ef1268aeedc5738ff1f3cade13e13715ae1b45f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 22:25:24 +0000 Subject: [PATCH 4/6] chore(deps): bump commons-validator:commons-validator from 1.7 to 1.9.0 Bumps commons-validator:commons-validator from 1.7 to 1.9.0. --- updated-dependencies: - dependency-name: commons-validator:commons-validator dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 790250250..ac6df993b 100644 --- a/pom.xml +++ b/pom.xml @@ -433,7 +433,7 @@ commons-validator commons-validator - 1.7 + 1.9.0 org.apache.commons From 695e80b6b74cb5e72bcf2c9238c24ce1e03b299d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nya=20=CE=9Elimu?= Date: Thu, 1 Aug 2024 12:57:11 +0000 Subject: [PATCH 5/6] [maven-release-plugin] prepare release webapp-2.4.24 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ac6df993b..2d4818d83 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ai.elimu webapp war - 2.4.24-SNAPSHOT + 2.4.24 11 @@ -142,7 +142,7 @@ scm:git:git@github.com:elimu-ai/webapp.git scm:git:https://github.com/elimu-ai/webapp.git https://github.com/elimu-ai/webapp - HEAD + webapp-2.4.24 From e690a5c9fd650b9d6a7d30e93b7fdec49a20335f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nya=20=CE=9Elimu?= Date: Thu, 1 Aug 2024 12:57:13 +0000 Subject: [PATCH 6/6] [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 2d4818d83..f8f698846 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ai.elimu webapp war - 2.4.24 + 2.4.25-SNAPSHOT 11 @@ -142,7 +142,7 @@ scm:git:git@github.com:elimu-ai/webapp.git scm:git:https://github.com/elimu-ai/webapp.git https://github.com/elimu-ai/webapp - webapp-2.4.24 + HEAD