From 7fee0b37684e3db00cfc16c0797910573e646f63 Mon Sep 17 00:00:00 2001
From: Zane Schepke <zanecschepke@gmail.com>
Date: Fri, 20 Sep 2024 01:37:26 -0400
Subject: [PATCH] cd: fix nightly

---
 .github/workflows/check-date.yml |  1 +
 .github/workflows/nightly.yml    | 18 ++++++++++--------
 .github/workflows/release.yml    |  7 +++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/check-date.yml b/.github/workflows/check-date.yml
index 62227f4..1471201 100644
--- a/.github/workflows/check-date.yml
+++ b/.github/workflows/check-date.yml
@@ -2,6 +2,7 @@ name: check-date
 
 on:
   workflow_dispatch:
+  workflow_call:
 
 jobs:
   check_date:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 29e9299..fd15728 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -3,15 +3,17 @@ name: nightly
 on:
   schedule:
     - cron: "4 3 * * *"
+  workflow_dispatch:
 jobs:
+  check-date:
+    uses: ./.github/workflows/check-date.yml
   nightly-publish-check:
     name: Nightly publish check
     runs-on: ubuntu-latest
-    needs: check_date
-    if: ${{ needs.check_date.outputs.should_run != 'false' }}
-    steps:
-      - name: Build and publish nightly
-        uses: ./.github/workflows/release.yml
-        secrets: inherit
-        with:
-          build_type: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }}
+    needs: check-date
+    if: ${{ needs.check-date.outputs.should_run != 'false' }}
+  publish-nightly:
+    name: Publish nightly
+    runs-on: ubuntu-latest
+    needs: nightly-publish-check
+    uses: ./.github/workflows/release.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a27c8f9..0cd7545 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ on:
           - alpha
           - beta
           - production
-        default: alpha
+        default: none
         required: true
       release_type:
         type: choice
@@ -28,12 +28,11 @@ on:
         description: "Tag name for release"
         required: false
         default: nightly
+  workflow_call:
 
 jobs:
   build:
     name: Build Signed APK
-    needs: check_date
-    if: ${{ inputs.release_type != 'none' && (needs.check_date.outputs.should_run != 'false' && )  }}
     runs-on: ubuntu-latest
 
     env:
@@ -48,7 +47,7 @@ jobs:
       GH_REPO: ${{ github.repository }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@4
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with: