From 03c6f110819e8f116e182cd1f9b8040ad0c36c7a Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Fri, 29 Apr 2022 18:05:20 -0400
Subject: [PATCH 1/2] Deploy to heroku with Heroku CLI directly

---
 .github/workflows/backend-staging-deploy.yml | 22 +++++++++++++++-----
 .github/workflows/update-release-branch.yml  | 22 ++++++++++++++------
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/backend-staging-deploy.yml b/.github/workflows/backend-staging-deploy.yml
index 45bea2bde..059745fe5 100644
--- a/.github/workflows/backend-staging-deploy.yml
+++ b/.github/workflows/backend-staging-deploy.yml
@@ -12,8 +12,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: akhileshns/heroku-deploy@v3.12.12
-        with:
-          heroku_api_key: ${{secrets.HEROKU_API_KEY}}
-          heroku_app_name: "dandi-api-staging"
-          heroku_email: ${{secrets.HEROKU_EMAIL}}
+
+      - name: Install Heroku CLI
+        run: curl https://cli-assets.heroku.com/install.sh | sh
+
+      - name: Install builds plugin
+        run: heroku plugins:install heroku-builds
+
+      - name: Build app into tarball
+        run: |
+          git fetch --prune --unshallow --tags
+          python setup.py sdist --formats=gztar
+
+      - name: Create Heroku Build
+        run: heroku builds:create -a dandi-api-staging --source-tar=dist/$(python setup.py --fullname).tar.gz
+        env:
+          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY  }}
+          HEROKU_EMAIL: ${{ secrets.HEROKU_EMAIL  }}
diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml
index 160e46804..2132b5362 100644
--- a/.github/workflows/update-release-branch.yml
+++ b/.github/workflows/update-release-branch.yml
@@ -27,9 +27,19 @@ jobs:
           fetch-depth: 0 # fetch history for all branches and tags
           ref: release
 
-      - name: Deploy to Heroku
-        uses: akhileshns/heroku-deploy@v3.12.12
-        with:
-          heroku_api_key: ${{secrets.HEROKU_API_KEY}}
-          heroku_app_name: "dandi-api"
-          heroku_email: ${{secrets.HEROKU_EMAIL}}
+      - name: Install Heroku CLI
+        run: curl https://cli-assets.heroku.com/install.sh | sh
+
+      - name: Install builds plugin
+        run: heroku plugins:install heroku-builds
+
+      - name: Build app into tarball
+        run: |
+          git fetch --prune --unshallow --tags
+          python setup.py sdist --formats=gztar
+
+      - name: Create Heroku Build
+        run: heroku builds:create -a dandi-api --source-tar=dist/$(python setup.py --fullname).tar.gz
+        env:
+          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY  }}
+          HEROKU_EMAIL: ${{ secrets.HEROKU_EMAIL  }}

From 4ee926bbe12b30a7e7a63abba29c7116160e102c Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Fri, 29 Apr 2022 18:11:53 -0400
Subject: [PATCH 2/2] Use checkout `fetch-depth` param

---
 .github/workflows/backend-staging-deploy.yml | 8 ++++----
 .github/workflows/update-release-branch.yml  | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/backend-staging-deploy.yml b/.github/workflows/backend-staging-deploy.yml
index 059745fe5..157a6691d 100644
--- a/.github/workflows/backend-staging-deploy.yml
+++ b/.github/workflows/backend-staging-deploy.yml
@@ -11,7 +11,9 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # fetch history for all branches and tags
 
       - name: Install Heroku CLI
         run: curl https://cli-assets.heroku.com/install.sh | sh
@@ -20,9 +22,7 @@ jobs:
         run: heroku plugins:install heroku-builds
 
       - name: Build app into tarball
-        run: |
-          git fetch --prune --unshallow --tags
-          python setup.py sdist --formats=gztar
+        run: python setup.py sdist --formats=gztar
 
       - name: Create Heroku Build
         run: heroku builds:create -a dandi-api-staging --source-tar=dist/$(python setup.py --fullname).tar.gz
diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml
index 2132b5362..4582e0371 100644
--- a/.github/workflows/update-release-branch.yml
+++ b/.github/workflows/update-release-branch.yml
@@ -34,9 +34,7 @@ jobs:
         run: heroku plugins:install heroku-builds
 
       - name: Build app into tarball
-        run: |
-          git fetch --prune --unshallow --tags
-          python setup.py sdist --formats=gztar
+        run: python setup.py sdist --formats=gztar
 
       - name: Create Heroku Build
         run: heroku builds:create -a dandi-api --source-tar=dist/$(python setup.py --fullname).tar.gz