From 5d3ae58d9cd69dd2a80ccb7d005196e5aafcaa97 Mon Sep 17 00:00:00 2001
From: Salah Al Saleh <sg.alsaleh@gmail.com>
Date: Tue, 26 Jul 2022 16:57:50 -0700
Subject: [PATCH] fix release workflow (#94)

---
 .github/workflows/main.yaml | 92 +++++++++++++------------------------
 1 file changed, 32 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 289e12d..c948c3f 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -6,68 +6,40 @@ on:
       - main
 
 jobs:
-  heroku login:
-    uses: actions/heroku@master
-    with:
-      args: container:login
-      secrets: 
-       - ${{secrets.HEROKU_API_KEY}}
+  release:
+    runs-on: ubuntu-latest
+    env:
+      HEROKU_API_KEY: ${{secrets.HEROKU_API_KEY}}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-  build registry:
-    needs: heroku login
-    uses: actions/docker/cli@master
-    with:
-      args: "build -t registry.heroku.com/ttlsh/web registry"
-  
-  push registry:
-    needs: build registry
-    with:
-      args: "push registry.heroku.com/ttlsh/web"
+      - name: heroku registry login
+        run: heroku container:login
 
-  release registry:
-    needs: push registry
-    uses: actions/heroku@master
-    with:
-      args: "container:release -a ttlsh web"
-      secrets: 
-       - ${{secrets.HEROKU_API_KEY}}
+      - name: build registry
+        run: docker build -t registry.heroku.com/ttlsh/web registry
 
-  build hooks:
-    needs: heroku login
-    uses: actions/docker/cli@master
-    with:
-      args: "build -f hooks/Dockerfile.hooks -t registry.heroku.com/ttlsh-hooks/web hooks"
+      - name: push registry
+        run: docker push registry.heroku.com/ttlsh/web
 
-  push hooks:
-    needs: build hooks
-    uses: actions/docker/cli@master
-    with:
-      args: "push registry.heroku.com/ttlsh-hooks/web"
+      - name: release registry
+        run: heroku container:release -a ttlsh web
 
-  release hooks:
-    needs: push hooks
-    uses: actions/heroku@master
-    with:
-      args: "container:release -a ttlsh-hooks web"
-      secrets:
-        - ${{secrets.HEROKU_API_KEY}}
-  
-  build reaper:
-    needs: heroku login
-    uses: actions/docker/cli@master
-    with:
-      args: "build -f hooks/Dockerfile.reap -t registry.heroku.com/ttlsh-hooks/reap hooks"
-    
-  push reaper:
-    needs: build reaper
-    uses: actions/docker/cli@master
-    with:
-     args: "push registry.heroku.com/ttlsh-hooks/reap"
-  
-  release reaper:
-    needs: push reaper
-    uses: actions/heroku@master
-    with:
-      args: "container:release -a ttlsh-hooks reap"
-      secrets:
-        - ${{secrets.HEROKU_API_KEY}}
\ No newline at end of file
+      - name: build hooks
+        run: docker build -f hooks/Dockerfile.hooks -t registry.heroku.com/ttlsh-hooks/web hooks
+
+      - name: push hooks
+        run: docker push registry.heroku.com/ttlsh-hooks/web
+
+      - name: release hooks
+        run: heroku container:release -a ttlsh-hooks web
+
+      - name: build reaper
+        run: docker build -f hooks/Dockerfile.reap -t registry.heroku.com/ttlsh-hooks/reap hooks
+
+      - name: push reaper
+        run: docker push registry.heroku.com/ttlsh-hooks/reap
+
+      - name: release reaper
+        run: heroku container:release -a ttlsh-hooks reap