From 30c7af68bd70068fd309ad77a9958c5e06887417 Mon Sep 17 00:00:00 2001
From: Alexander Davis <AlexanderEDavis@users.noreply.github.com>
Date: Sun, 16 Aug 2020 22:42:46 +0100
Subject: [PATCH] Fixing Fixing Fixing Deploy (#106)

Cause I'm a smart boii
---
 .github/workflows/deploy.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d5e408e..0f3e4a8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,6 +7,8 @@ jobs:
   bump-version:
     name: Bump version number
     runs-on: ubuntu-latest
+    outputs: 
+      ver: ${{ steps.ver.outputs.version }}
     steps:
     - id: bump
       uses: zwaldowski/match-label-action@v1
@@ -20,6 +22,7 @@ jobs:
 
   docker-dh:
     name: Push to Docker Hub
+    needs: [bump-version]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -27,17 +30,18 @@ jobs:
       run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
     - name: Build image for Docker Hub
       env:
-        VERSION: ${{ jobs.bump-version.steps.ver.outputs.version }}
+        VERSION: ${{ needs.bump-version.output.ver }}
       run: docker build . --file Dockerfile --tag luketainton/fhed:$VERSION luketainton/fhed:latest
     - name: Push image to Docker Hub
       env:
-        VERSION: ${{ jobs.bump-version.steps.ver.outputs.version }}
+        VERSION: ${{ needs.bump-version.output.ver }}
       run: |
         docker push luketainton/fhed:$VERSION &&
         docker push luketainton/fhed:latest
       
   docker-ghr:
     name: Push to GitHub Package Registry
+    needs: [bump-version]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -45,11 +49,11 @@ jobs:
       run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u luketainton --password-stdin
     - name: Build image for GitHub Package Registry
       env:
-        VERSION: ${{ jobs.bump-version.steps.ver.outputs.version }}
+        VERSION: ${{ needs.bump-version.output.ver }}
       run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/fhed/fhed:latest docker.pkg.github.com/luketainton/fhed/fhed:$VERSION
     - name: Push image to GitHub Package Registry
       env:
-        VERSION: ${{ jobs.bump-version.steps.ver.outputs.version }}
+        VERSION: ${{ needs.bump-version.output.ver }}
       run: |
         docker push docker.pkg.github.com/luketainton/fhed/fhed:$VERSION &&
         docker push docker.pkg.github.com/luketainton/fhed/fhed:latest