Просмотр исходного кода

chore: Attempt to fix mysql CI setup

Michael Bromley 5 лет назад
Родитель
Сommit
7a585c549f

+ 4 - 3
.github/workflows/build_and_test.yml

@@ -55,12 +55,13 @@ jobs:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
       mysql:
-        image: mysql:8
+        image: bitnami/mysql:8.0
         env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_AUTHENTICATION_PLUGIN: mysql_native_password
         ports:
           - 3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+        options: --health-cmd="mysqladmin ping --silent" --health-interval=10s --health-timeout=20s --health-retries=10
       postgres:
         image: postgres:12
         env:

+ 0 - 3
e2e-common/test-config.ts

@@ -8,8 +8,6 @@ import {
 } from '@vendure/testing';
 import path from 'path';
 import { ConnectionOptions } from 'typeorm';
-import { DefaultLogger } from '../packages/core/src/config/logger/default-logger';
-import { LogLevel } from '../packages/core/src/config/logger/vendure-logger';
 
 import { getPackageDir } from './get-package-dir';
 
@@ -52,7 +50,6 @@ export const testConfig = mergeConfig(defaultTestConfig, {
         pollInterval: 100,
     },
     dbConnectionOptions: getDbConfig(),
-    logger: new DefaultLogger({ level: LogLevel.Verbose }),
 });
 
 function getDbConfig(): ConnectionOptions {

+ 1 - 2
packages/testing/src/test-server.ts

@@ -43,8 +43,7 @@ export class TestServer {
             await initializer.populate(populateFn);
             await initializer.destroy();
         } catch (e) {
-            console.log(e);
-            process.exit(1);
+            throw e;
         }
         await this.bootstrap();
     }