From 2b5a32c15759bc26a47cd576371a7b7db73c0375 Mon Sep 17 00:00:00 2001
From: developomp <developomp@gmail.com>
Date: Mon, 17 May 2021 17:49:55 +0900
Subject: [PATCH] trying other github actions

---
 .github/workflows/firebase-hosting-merge.yml | 29 ++++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
index eee14fe..28fa7c2 100644
--- a/.github/workflows/firebase-hosting-merge.yml
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -1,6 +1,3 @@
-# This file was auto-generated by the Firebase CLI
-# https://github.com/firebase/firebase-tools
-
 name: Deploy to Firebase Hosting on merge
 on:
     push:
@@ -8,15 +5,23 @@ on:
             - dev
 jobs:
     build_and_deploy:
+        name: Build and Deploy
+        needs: build
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
-            - run: cd source && yarn install && yarn build # install dependencies and build site
-            - run: /usr/local/bin/npx firebase-tools target:apply hosting dev developomp-site # Configure target
-            - uses: FirebaseExtended/action-hosting-deploy@v0
+            - name: Checkout Repo
+              uses: actions/checkout@master
+            - name: Install dependencies and build site
+              run: cd source && yarn install && yarn build
+            - name: Apply target
+              uses: w9jds/firebase-action@master
               with:
-                  repoToken: "${{ secrets.GITHUB_TOKEN }}"
-                  firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_DEVELOPOMP_SITE }}"
-                  channelId: live
-                  projectId: developomp-site
-                  target: dev
+                  args: target:apply hosting dev developomp-site
+              env:
+                  FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
+            - name: Deploy to Firebase
+              uses: w9jds/firebase-action@master
+              with:
+                  args: deploy --only hosting
+              env:
+                  FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}