From 2e2b859f25cafdb713ecd6471be5f56db22e8e41 Mon Sep 17 00:00:00 2001
From: Daniel Chalmers <daniel.chalmers@outlook.com>
Date: Sun, 21 Jan 2024 01:47:45 -0600
Subject: [PATCH] Fix secrets in workflows

---
 .github/actions/full-build/action.yml | 14 +++++++++++---
 .github/workflows/build.yml           |  3 +++
 .github/workflows/deploy.yml          |  3 +++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/actions/full-build/action.yml b/.github/actions/full-build/action.yml
index 03aad9a..b152d5e 100644
--- a/.github/actions/full-build/action.yml
+++ b/.github/actions/full-build/action.yml
@@ -2,6 +2,14 @@ name: Full build
 
 description: Builds and tests
 
+inputs:
+  RELEASE_KEYSTORE_BASE64:
+    description: 'RELEASE_KEYSTORE_BASE64'
+    required: true
+  RELEASE_KEYSTORE_PASS:
+    description: 'RELEASE_KEYSTORE_PASS'
+    required: true
+
 runs:
   using: "composite"
   steps:
@@ -28,7 +36,7 @@ runs:
       uses: timheuer/base64-to-file@v1.2
       with:
         fileName: release.keystore
-        encodedString: "${{ secrets.RELEASE_KEYSTORE_BASE64 }}"
+        encodedString: "${{ inputs.RELEASE_KEYSTORE_BASE64 }}"
 
     - name: Build for Android
       shell: bash
@@ -36,9 +44,9 @@ runs:
         dotnet publish JournalApp\JournalApp.csproj -o publish -c:Release -f:net8.0-android
         -p:AndroidKeyStore=True
         -p:AndroidSigningKeyStore="${{ steps.create_keystore.outputs.filePath }}"
-        -p:AndroidSigningStorePass="${{ secrets.RELEASE_KEYSTORE_PASS }}"
+        -p:AndroidSigningStorePass="${{ inputs.RELEASE_KEYSTORE_PASS }}"
         -p:AndroidSigningKeyAlias="key"
-        -p:AndroidSigningKeyPass="${{ secrets.RELEASE_KEYSTORE_PASS }}"
+        -p:AndroidSigningKeyPass="${{ inputs.RELEASE_KEYSTORE_PASS }}"
     
     - name: List build output
       shell: bash
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bbf9d3b..430d512 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,6 +13,9 @@ jobs:
       - uses: actions/checkout@v4
       
       - uses: ./.github/actions/full-build
+        with:
+          RELEASE_KEYSTORE_BASE64: "${{ secrets.RELEASE_KEYSTORE_BASE64 }}"
+          RELEASE_KEYSTORE_PASS: "${{ secrets.RELEASE_KEYSTORE_PASS }}"
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d311cb3..8910dc2 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -12,6 +12,9 @@ jobs:
       - uses: actions/checkout@v4
       
       - uses: ./.github/actions/full-build
+        with:
+          RELEASE_KEYSTORE_BASE64: "${{ secrets.RELEASE_KEYSTORE_BASE64 }}"
+          RELEASE_KEYSTORE_PASS: "${{ secrets.RELEASE_KEYSTORE_PASS }}"
 
       - uses: dotnet/nbgv@v0.4.1
         id: nbgv