From ff386c8bdda70a13f512ba862c7cbd9824daa58c Mon Sep 17 00:00:00 2001
From: MunJangHun <105299421+moondev03@users.noreply.github.com>
Date: Mon, 5 Aug 2024 04:27:53 +0900
Subject: [PATCH] [chore] Update app-distribution-ci-cd.yaml

---
 .github/workflows/app-distribution-ci-cd.yaml | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/app-distribution-ci-cd.yaml b/.github/workflows/app-distribution-ci-cd.yaml
index e6387c7..703a480 100644
--- a/.github/workflows/app-distribution-ci-cd.yaml
+++ b/.github/workflows/app-distribution-ci-cd.yaml
@@ -1,4 +1,4 @@
-name: Build & upload to Firebase App Distribution
+name: Build & Upload to Firebase App Distribution
 
 on:
   push:
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches:
       - develop
-  workflow_dispatch:
+  workflow_dispatch: # 수동 실행 옵션
 
 jobs:
   build:
@@ -35,14 +35,25 @@ jobs:
       - name: Verify keystore
         run: |
           ls -alh ./Nabi/presentation/
-          keytool -list -v -keystore ./Nabi/presentation/keystore.jks || echo "Keystore verification failed"
+          echo "Checking JKS format..."
+          keytool -list -v -keystore ./Nabi/presentation/keystore.jks -storetype JKS || echo "JKS format verification failed"
+
+          echo "Checking PKCS12 format..."
+          keytool -list -v -keystore ./Nabi/presentation/keystore.jks -storetype PKCS12 || echo "PKCS12 format verification failed"
+
+      - name: Convert keystore to JKS if necessary
+        run: |
+          # Check if keystore is PKCS12 format and convert to JKS if needed
+          if keytool -list -v -keystore ./Nabi/presentation/keystore.jks -storetype PKCS12 > /dev/null 2>&1; then
+            echo "Converting PKCS12 keystore to JKS..."
+            keytool -importkeystore -srckeystore ./Nabi/presentation/keystore.jks -srcstoretype PKCS12 -destkeystore ./Nabi/presentation/keystore.jks -deststoretype JKS
+          fi
 
       - name: Create google-services.json
         run: echo "$GOOGLE_SERVICES_JSON" > ./Nabi/presentation/google-services.json
 
       - name: Create local.properties
-        run: |
-          echo "$LOCAL_PROPERTIES_CONTENTS" > ./Nabi/local.properties
+        run: echo "$LOCAL_PROPERTIES_CONTENTS" > ./Nabi/local.properties
 
       - name: Build release APK
         run: |