From 39878af325619fc593fd7fa68d179d032bad452d Mon Sep 17 00:00:00 2001
From: IT-MikeS <20338451+IT-MikeS@users.noreply.github.com>
Date: Tue, 15 Nov 2022 16:00:29 -0500
Subject: [PATCH 1/2] chore: pass secrets to reusable workflows

---
 .github/workflows/publish-android.yml    | 24 ++++++++++++++++++++++--
 .github/workflows/publish-latest.yml     | 13 ++++++++++++-
 .github/workflows/publish-npm-latest.yml |  9 ++++++++-
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml
index 47ba11f242..1a8ab09448 100644
--- a/.github/workflows/publish-android.yml
+++ b/.github/workflows/publish-android.yml
@@ -1,6 +1,24 @@
 name: Publish Native Android Library
 
-on: [workflow_dispatch, workflow_call]
+on: 
+  workflow_call:
+    secrets:
+      ANDROID_OSSRH_USERNAME:
+        required: true
+      ANDROID_OSSRH_PASSWORD:
+        required: true
+      ANDROID_SIGNING_KEY_ID:
+        required: true
+      ANDROID_SIGNING_PASSWORD:
+        required: true
+      ANDROID_SIGNING_KEY:
+        required: true
+      ANDROID_SONATYPE_STAGING_PROFILE_ID:
+        required: true
+      CAP_GH_RELEASE_TOKEN:
+        required: true
+  workflow_dispatch:
+
 jobs:
   publish-android:
     runs-on: ubuntu-latest
@@ -9,7 +27,9 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
       - name: set up JDK 11
         uses: actions/setup-java@v2
         with:
diff --git a/.github/workflows/publish-latest.yml b/.github/workflows/publish-latest.yml
index 7f4c719c2b..1f3cb07c53 100644
--- a/.github/workflows/publish-latest.yml
+++ b/.github/workflows/publish-latest.yml
@@ -5,6 +5,17 @@ on: workflow_dispatch
 jobs:
   publish-npm-latest:
     uses: ./.github/workflows/publish-npm-latest.yml
+    secrets:
+      CAP_GH_RELEASE_TOKEN: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   publish-android:
     needs: publish-npm-latest
-    uses: ./.github/workflows/publish-android.yml
\ No newline at end of file
+    uses: ./.github/workflows/publish-android.yml
+    with:
+      ANDROID_OSSRH_USERNAME: ${{ secrets.ANDROID_OSSRH_USERNAME }}
+      ANDROID_OSSRH_PASSWORD: ${{ secrets.ANDROID_OSSRH_PASSWORD }}
+      ANDROID_SIGNING_KEY_ID: ${{ secrets.ANDROID_SIGNING_KEY_ID }}
+      ANDROID_SIGNING_PASSWORD: ${{ secrets.ANDROID_SIGNING_PASSWORD }}
+      ANDROID_SIGNING_KEY: ${{ secrets.ANDROID_SIGNING_KEY }}
+      ANDROID_SONATYPE_STAGING_PROFILE_ID: ${{ secrets.ANDROID_SONATYPE_STAGING_PROFILE_ID }}
+      CAP_GH_RELEASE_TOKEN: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/publish-npm-latest.yml b/.github/workflows/publish-npm-latest.yml
index 3a0423b391..8cb59287f1 100644
--- a/.github/workflows/publish-npm-latest.yml
+++ b/.github/workflows/publish-npm-latest.yml
@@ -1,6 +1,13 @@
 name: Publish NPM Latest
 
-on: [workflow_dispatch, workflow_call]
+on: 
+  workflow_call:
+    secrets:
+      CAP_GH_RELEASE_TOKEN:
+        required: true
+      NPM_TOKEN:
+        required: true
+  workflow_dispatch:
 
 jobs:
   deploy-npm-latest:

From 339a2751d72e712c29e9af90662085afc13a8a94 Mon Sep 17 00:00:00 2001
From: Carl Poole <carl@ionic.io>
Date: Tue, 15 Nov 2022 15:23:32 -0600
Subject: [PATCH 2/2] change android call to use secrets

---
 .github/workflows/publish-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-latest.yml b/.github/workflows/publish-latest.yml
index 1f3cb07c53..3410584fa2 100644
--- a/.github/workflows/publish-latest.yml
+++ b/.github/workflows/publish-latest.yml
@@ -11,7 +11,7 @@ jobs:
   publish-android:
     needs: publish-npm-latest
     uses: ./.github/workflows/publish-android.yml
-    with:
+    secrets:
       ANDROID_OSSRH_USERNAME: ${{ secrets.ANDROID_OSSRH_USERNAME }}
       ANDROID_OSSRH_PASSWORD: ${{ secrets.ANDROID_OSSRH_PASSWORD }}
       ANDROID_SIGNING_KEY_ID: ${{ secrets.ANDROID_SIGNING_KEY_ID }}