Merge pull request 'master' (#7) from master into prod

Reviewed-on: #7

.gitea/workflows/build-and-push.yaml

@@ -1,24 +0,0 @@
-name: Build and push
-
-on:
-  workflow_run:
-    workflows: [Deploy Dev, Deploy Prod]
-
-jobs:
-    build:
-        name: Build
-        runs-on: [dev]
-        steps:
-            - name: login
-              run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
-            - name: checkout
-              uses: actions/checkout@v4
-            - name: build
-              run: docker build -t mathwave/sprint-repo:pizda-bot .
-    push:
-        name: Push
-        runs-on: [dev]
-        needs: build
-        steps:
-            - name: push
-              run: docker push mathwave/sprint-repo:pizda-bot

.gitea/workflows/deploy-dev.yaml

@@ -7,9 +7,29 @@ on:
     types: [closed]
 
 jobs:
+  build:
+    name: Build
+    runs-on: [ dev ]
+    steps:
+      - name: login
+        run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          ref: dev
+      - name: build
+        run: docker build -t mathwave/sprint-repo:pizda-bot .
+  push:
+    name: Push
+    runs-on: [ dev ]
+    needs: build
+    steps:
+      - name: push
+        run: docker push mathwave/sprint-repo:pizda-bot
   deploy-dev:
     name: Deploy dev
     runs-on: [dev]
+    needs: push
     steps:
       - name: login
         run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}

.gitea/workflows/deploy-prod.yaml

@@ -7,9 +7,29 @@ on:
     types: [closed]
 
 jobs:
+  build:
+    name: Build
+    runs-on: [ dev ]
+    steps:
+      - name: login
+        run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          ref: prod
+      - name: build
+        run: docker build -t mathwave/sprint-repo:pizda-bot .
+  push:
+    name: Push
+    runs-on: [ dev ]
+    needs: build
+    steps:
+      - name: push
+        run: docker push mathwave/sprint-repo:pizda-bot
   deploy-prod:
     name: Deploy prod
     runs-on: [prod]
+    needs: push
     steps:
       - name: login
         run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -19,7 +39,7 @@ jobs:
             ref: prod
       - name: deploy
         env:
-                  TELEGRAM_TOKEN_PROD: ${{ secrets.TELEGRAM_TOKEN_PROD}}
-                  MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }}
+          TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_PROD }}
+          MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_PROD }}
           PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
         run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml pizda-bot