From 8c48f1207e192358a9eb6b9807b8bb6abb7d26b5 Mon Sep 17 00:00:00 2001
From: Oleg Yurchik <oleg@yurchik.space>
Date: Sun, 1 Oct 2023 15:23:30 +0300
Subject: [PATCH] hotfix/59 fix env variables

---
 .github/workflows/deploy-production.yaml | 31 +++++++++++++-----------
 .github/workflows/deploy-stage.yaml      | 31 +++++++++++++-----------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/deploy-production.yaml b/.github/workflows/deploy-production.yaml
index 5f957575..00c42560 100644
--- a/.github/workflows/deploy-production.yaml
+++ b/.github/workflows/deploy-production.yaml
@@ -15,19 +15,22 @@ jobs:
     needs: [build]
     runs-on: self-hosted
     steps:
+      - name: Set environment variables
+        run: |
+          echo "
+            # Secrets names
+            HABR_OAUTH2_CLIENT_ID_NAME=habr_oauth2_client_id_production
+            HABR_OAUTH2_CLIENT_SECRET_NAME=habr_oauth2_client_secret_production
+            POSTGRESQL_PASSWORD_NAME=postgresql_password_production
+            
+            DATABASE_DIR=/sapphire/production/database_data
+            REDIS_DIR=/sapphire/production/redis_data
+            BROKER_DIR=/sapphire/production/broker_dir
+            SAPPHIRE_IMAGE=sapphire:${GITHUB_REF_NAME}
+            USERS_PORT=3000
+            USERS_DB_DSN=${USERS_DB_DSN_PRODUCTION}
+            PROJECTS_PORT=3020
+            PROJECTS_DB_DSN=${PROJECTS_DB_DSN_PRODUCTION}
+          " >> $GITHUB_ENV
       - name: Deploy
-        env:
-          # Secrets names
-          HABR_OAUTH2_CLIENT_ID_NAME: "habr_oauth2_client_id_production"
-          HABR_OAUTH2_CLIENT_SECRET_NAME: "habr_oauth2_client_secret_production"
-          POSTGRESQL_PASSWORD_NAME: "postgresql_password_production"
-
-          DATABASE_DIR: "/sapphire/production/database_data"
-          REDIS_DIR: "/sapphire/production/redis_data"
-          BROKER_DIR: "/sapphire/production/broker_dir"
-          SAPPHIRE_IMAGE: sapphire:${{ github.ref_name }}
-          USERS_PORT: "3000"
-          USERS_DB_DSN: "${USERS_DB_DSN_PRODUCTION}"
-          PROJECTS_PORT: "3020"
-          PROJECTS_DB_DSN: "${PROJECTS_DB_DSN_PRODUCTION}"
         run: docker stack deploy -c docker-compose.yaml sapphire-stage
diff --git a/.github/workflows/deploy-stage.yaml b/.github/workflows/deploy-stage.yaml
index f6c162f5..8d50bff4 100644
--- a/.github/workflows/deploy-stage.yaml
+++ b/.github/workflows/deploy-stage.yaml
@@ -15,19 +15,22 @@ jobs:
     needs: [build]
     runs-on: self-hosted
     steps:
+      - name: Set environment variables
+        run: |
+          echo "
+            # Secrets names
+            HABR_OAUTH2_CLIENT_ID_NAME=habr_oauth2_client_id_stage
+            HABR_OAUTH2_CLIENT_SECRET_NAME=habr_oauth2_client_secret_stage
+            POSTGRESQL_PASSWORD_NAME=postgresql_password_stage
+            
+            DATABASE_DIR=/sapphire/stage/database_data
+            REDIS_DIR=/sapphire/stage/redis_data
+            BROKER_DIR=/sapphire/stage/broker_dir
+            SAPPHIRE_IMAGE=sapphire:${GITHUB_REF_NAME}
+            USERS_PORT=2000
+            USERS_DB_DSN=${USERS_DB_DSN_STAGE}
+            PROJECTS_PORT=2020
+            PROJECTS_DB_DSN=${PROJECTS_DB_DSN_STAGE}
+          " >> $GITHUB_ENV
       - name: Deploy
-        env:
-          # Secrets names
-          HABR_OAUTH2_CLIENT_ID_NAME: "habr_oauth2_client_id_stage"
-          HABR_OAUTH2_CLIENT_SECRET_NAME: "habr_oauth2_client_secret_stage"
-          POSTGRESQL_PASSWORD_NAME: "postgresql_password_stage"
-
-          DATABASE_DIR: "/sapphire/stage/database_data"
-          REDIS_DIR: "/sapphire/stage/redis_data"
-          BROKER_DIR: "/sapphire/stage/broker_dir"
-          SAPPHIRE_IMAGE: sapphire:${{ github.sha }}
-          USERS_PORT: "2000"
-          USERS_DB_DSN: "${USERS_DB_DSN_STAGE}"
-          PROJECTS_PORT: "2020"
-          PROJECTS_DB_DSN: "${PROJECTS_DB_DSN_STAGE}"
         run: docker stack deploy -c docker-compose.yaml sapphire-stage