ci: fix env vars

adonisjs · Sep 19, 2023 · 9472db9 · 9472db9
1 parent 1417942
commit 9472db9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 30 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,9 +35,11 @@ jobs:
       postgres:
         image: postgres:${{ matrix.postgres-version }}
         env:
-          POSTGRES_DB: lucid
-          POSTGRES_USER: virk
-          POSTGRES_PASSWORD: password
+          PG_HOST: localhost
+          PG_PASSWORD: secret
+          PG_DATABASE: lucid
+          PG_PORT: 5432
+          PG_USER: virk
         ports:
           - 5432:5432
     steps:
@@ -61,9 +63,17 @@ jobs:
       mysql:
         image: mysql:${{ matrix.mysql.version }}
         env:
+          MYSQL_HOST: localhost
+          MYSQL_PASSWORD: secret
           MYSQL_DATABASE: lucid
+          MYSQL_PORT: 3306
           MYSQL_USER: virk
-          MYSQL_PASSWORD: password
+          MYSQL_ROOT_PASSWORD: password
+          LEGACY_MYSQL_HOST: localhost
+          LEGACY_MYSQL_PASSWORD: secret
+          LEGACY_MYSQL_DATABASE: lucid
+          LEGACY_MYSQL_PORT: 3306
+          LEGACY_MYSQL_USER: virk
           MYSQL_ROOT_PASSWORD: password
         ports:
           - '3306:3306'

diff --git a/test-helpers/index.ts b/test-helpers/index.ts
@@ -8,18 +8,20 @@
  */
 
 import dotenv from 'dotenv'
-import { join } from 'node:path'
 import { Chance } from 'chance'
+import { join } from 'node:path'
 import knex, { Knex } from 'knex'
+import { fileURLToPath } from 'node:url'
 import { getActiveTest } from '@japa/runner'
 import { Logger } from '@adonisjs/core/logger'
 import { Emitter } from '@adonisjs/core/events'
+import { Application } from '@adonisjs/core/app'
 import { AppFactory } from '@adonisjs/core/factories/app'
 
 import {
+  DatabaseConfig,
   ConnectionConfig,
   ConnectionContract,
-  DatabaseConfig,
   QueryClientContract,
 } from '../src/types/database.js'
 
@@ -29,31 +31,17 @@ import {
   DatabaseQueryBuilderContract,
 } from '../src/types/querybuilder.js'
 
-import { MigratorOptions } from '../src/types/migrator.js'
-import { LucidRow, LucidModel, AdapterContract } from '../src/types/model.js'
-
-import { fileURLToPath } from 'node:url'
-import { QueryClient } from '../src/query_client/index.js'
+import { Schema } from '../src/schema/main.js'
 import { Database } from '../src/database/main.js'
-import { DatabaseQueryBuilder } from '../src/database/query_builder/database.js'
+import { Adapter } from '../src/orm/adapter/index.js'
+import { BaseModel } from '../src/orm/base_model/index.js'
+import { QueryClient } from '../src/query_client/index.js'
+import { MigratorOptions } from '../src/types/migrator.js'
+import { MigrationRunner } from '../src/migration/runner.js'
 import { RawQueryBuilder } from '../src/database/query_builder/raw.js'
 import { InsertQueryBuilder } from '../src/database/query_builder/insert.js'
-import { MigrationRunner } from '../src/migration/runner.js'
-import { Application } from '@adonisjs/core/app'
-import { Schema } from '../src/schema/main.js'
-import { BaseModel } from '../src/orm/base_model/index.js'
-import { Adapter } from '../src/orm/adapter/index.js'
-
-// import { Schema } from '../src/Schema'
-// import { Migrator } from '../src/Migrator'
-// import { Adapter } from '../src/Orm/Adapter'
-// import { Database } from '../src/Database/index'
-// import { QueryClient } from '../src/QueryClient'
-// import { BaseModel } from '../src/Orm/BaseModel'
-// import { FactoryModel } from '../src/Factory/FactoryModel'
-// import { RawQueryBuilder } from '../src/Database/QueryBuilder/Raw'
-// import { InsertQueryBuilder } from '../src/Database/QueryBuilder/Insert'
-// import { DatabaseQueryBuilder } from '../src/Database/QueryBuilder/Database'
+import { LucidRow, LucidModel, AdapterContract } from '../src/types/model.js'
+import { DatabaseQueryBuilder } from '../src/database/query_builder/database.js'
 
 dotenv.config()
 export const APP_ROOT = new URL('./tmp', import.meta.url)
@@ -136,9 +124,9 @@ export function getConfig(): ConnectionConfig {
       return {
         client: 'mssql',
         connection: {
-          user: process.env.MSSQL_USER as string,
-          port: Number(process.env.MSSQL_PORT! as string),
           server: process.env.MSSQL_HOST as string,
+          port: Number(process.env.MSSQL_PORT! as string),
+          user: process.env.MSSQL_USER as string,
           password: process.env.MSSQL_PASSWORD as string,
           database: 'master',
           options: {