From 7be815173161b9633260bb43106b905fe32db7d9 Mon Sep 17 00:00:00 2001
From: Konstantin Kiselev <dimamid99@gmail.com>
Date: Fri, 28 Jan 2022 02:07:31 +0300
Subject: [PATCH] feature/ci-cd add cd job deps

---
 .deploy/deploy.sh         | 2 +-
 .github/workflows/cd.yaml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.deploy/deploy.sh b/.deploy/deploy.sh
index b0deedb..ecef96f 100755
--- a/.deploy/deploy.sh
+++ b/.deploy/deploy.sh
@@ -2,6 +2,6 @@ PIGEOMAIL_VERSION="$1"
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 echo "PIGEOMAIL_VERSION=$PIGEOMAIL_VERSION" > "$SCRIPT_DIR"/.env
-docker-compose up -f docker-compose.yml -d
+docker-compose up -f "$SCRIPT_DIR"/.deploy/docker-compose.yml -d
 
 exit 0
\ No newline at end of file
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 2b5e52a..5c4a009 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -1,4 +1,4 @@
-name: Publish release and deploy
+name: Release and deploy
 
 on:
   push:
@@ -45,6 +45,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
   publish-release:
+    needs: build-and-push-image
     name: Publish release
     runs-on: ubuntu-latest
     permissions:
@@ -62,6 +63,7 @@ jobs:
           prerelease: false
 
   deploy:
+    needs: build-and-push-image
     name: Deploy
     runs-on: ubuntu-latest
     steps: