Moved and merged the env blocks.

Debianov · Aug 30, 2024 · 5e18b82 · 5e18b82
1 parent 6732d7c
commit 5e18b82
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -12,10 +12,6 @@ jobs:
     services:
       postgres:
         image: postgres
-        env:
-          POSTGRES_DB: postgres
-          POSTGRES_USER: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
         ports:
           - 5432/tcp
         options: >-
@@ -26,6 +22,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - env:
+        POSTGRES_DB: postgres
+        POSTGRES_USER: postgres
+        POSTGRES_HOST_AUTH_METHOD: trust
+        POSTGRES_HOST: localhost
+        POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
+
       - name: Install poetry
         run: pipx install poetry
 
@@ -46,11 +49,6 @@ jobs:
       - name: Run mypy
         run: poetry run mypy .
       - name: Create tables of schema.sql
-        env:
-          POSTGRES_HOST: localhost
-          POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
-          POSTGRES_TEST_DBNAME: postgres
-          POSTGRES_USER: postgres
         run: poetry run psql --set=ON_ERROR_STOP=1 --host=${{ env.POSTGRES_HOST }} --port=${{ env.POSTGRES_PORT }} --username=${{ env.POSTGRES_USER }} --dbname=${{ env.POSTGRES_TEST_DBNAME }}  --file=schema.sql --echo-errors
       - name: Run tests
         run: |

diff --git a/bot/main.py b/bot/main.py
@@ -206,7 +206,7 @@ async def DBConnFactory(**kwargs: str) -> psycopg.AsyncConnection[Any]:
 def runForPoetry() -> None:
 	_setup_logging()
 	loop = asyncio.get_event_loop()
-	if extract_envs := getEnvIfExist("POSTGRES_DBNAME", "POSTGRES_USER"):
+	if extract_envs := getEnvIfExist("POSTGRES_DB", "POSTGRES_USER"):
 		dbconn = loop.run_until_complete(DBConnFactory(
 			dbname=extract_envs[0],
 			user=extract_envs[1]

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -88,18 +88,17 @@ async def setupDB() -> psycopg.AsyncConnection[Any]:
 	if github_action_envs := getEnvIfExist(
 		"POSTGRES_HOST",
 		"POSTGRES_PORT",
-		"POSTGRES_TEST_DBNAME",
+		"POSTGRES_DB",
 		"POSTGRES_USER"
 	):
 		future_dbconn = await DBConnFactory(
 			host=github_action_envs[0],
 			port=github_action_envs[1],
-			password=github_action_envs[2],
-			dbname=github_action_envs[3],
-			user=github_action_envs[4]
+			dbname=github_action_envs[2],
+			user=github_action_envs[3]
 		)
 	elif envs := getEnvIfExist(
-		"POSTGRES_TEST_DBNAME",
+		"POSTGRES_DB",
 		"POSTGRES_USER"
 	):
 		future_dbconn = await DBConnFactory(