From 5fe71bfce9d20929c676723276e10cd2569604ce Mon Sep 17 00:00:00 2001
From: MurakawaTakuya <murakawatakuya5@gmail.com>
Date: Wed, 6 Nov 2024 13:57:27 +0900
Subject: [PATCH] =?UTF-8?q?merge=E6=99=82=E3=81=ABfunctions=E3=82=82?=
 =?UTF-8?q?=E3=83=87=E3=83=97=E3=83=AD=E3=82=A4=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/firebase-hosting-merge.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
index dbd8a24..c1895b6 100644
--- a/.github/workflows/firebase-hosting-merge.yml
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -1,7 +1,7 @@
 # This file was auto-generated by the Firebase CLI
 # https://github.com/firebase/firebase-tools
 
-name: Deploy to Firebase Hosting on merge
+name: Deploy to Firebase Hosting and Functions on merge
 on:
   push:
     branches:
@@ -13,9 +13,6 @@ jobs:
       - uses: actions/checkout@v4
       - run: npm ci
       - run: npm run build
-      - uses: FirebaseExtended/action-hosting-deploy@v0
-        with:
-          repoToken: ${{ secrets.GITHUB_TOKEN }}
-          firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_TODO_REAL_C28FA }}
-          channelId: live
-          projectId: todo-real-c28fa
+      - run: |
+          # Firebase CLIでHostingとFunctionsをデプロイ
+          npx firebase-tools deploy --only hosting,functions --project todo-real-c28fa --token "${{ secrets.FIREBASE_SERVICE_ACCOUNT_TODO_REAL_C28FA }}"