Run Liquibase migrations blocking before startup.

TeamPiped · Aug 14, 2023 · e32ffb1 · e32ffb1
1 parent 1175a1c
commit e32ffb1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
@@ -23,6 +23,12 @@ jobs:
           - Dockerfile.azul.ci
           - Dockerfile.openj9.ci
           - Dockerfile.graalvm-jvm.ci
+        include:
+          - sleep: 20
+          - docker-compose-file: testing/docker-compose.cockroachdb.yml
+            sleep: 30
+          - docker-compose-file: testing/docker-compose.yugabytedb.yml
+            sleep: 120
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -45,7 +51,7 @@ jobs:
           file: ${{ matrix.dockerfile }}
           tags: 1337kavin/piped:latest
       - name: Start Docker-Compose services
-        run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep 20
+        run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
       - name: Run tests
         run: ./testing/api-test.sh
       - name: Collect services logs

diff --git a/src/main/java/me/kavin/piped/Main.java b/src/main/java/me/kavin/piped/Main.java
@@ -46,6 +46,13 @@ public static void main(String[] args) throws Exception {
 
         Injector.useSpecializer();
 
+        try {
+            LiquibaseHelper.init();
+        } catch (Exception e) {
+            ExceptionHandler.handle(e);
+            System.exit(1);
+        }
+
         Multithreading.runAsync(() -> new Thread(new SyncRunner(
                 new OkHttpClient.Builder().readTimeout(60, TimeUnit.SECONDS).build(),
                 MATRIX_SERVER,
@@ -69,13 +76,6 @@ public void run() {
                 }
             }).start();
 
-        try {
-            LiquibaseHelper.init();
-        } catch (Exception e) {
-            ExceptionHandler.handle(e);
-            System.exit(1);
-        }
-
         try (Session ignored = DatabaseSessionFactory.createSession()) {
             System.out.println("Database connection is ready!");
         } catch (Throwable t) {