From c3288415548be6a88f19b07f4a96e7a283ac61e3 Mon Sep 17 00:00:00 2001
From: developomp <developomp@gmail.com>
Date: Sun, 27 Jun 2021 14:35:03 +0900
Subject: [PATCH] moving branch from dev to master

---
 .github/workflows/firebase-hosting-merge.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
index 3fb6f4d..b0d07b7 100644
--- a/.github/workflows/firebase-hosting-merge.yml
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -2,7 +2,7 @@ name: Deploy to Firebase Hosting on merge
 on:
     push:
         branches:
-            - dev
+            - master
 jobs:
     build:
         name: Build
@@ -10,6 +10,10 @@ jobs:
         steps:
             - name: Checkout Repo
               uses: actions/checkout@master
+            - uses: actions/cache@main
+              with:
+                  path: "**/node_modules"
+                  key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
             - name: Install Dependencies and Build
               run: cd source && yarn install && yarn build
             - name: Archive Production Artifact
@@ -35,15 +39,9 @@ jobs:
                   args: use developomp-site
               env:
                   FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
-            - name: Apply target
-              uses: w9jds/firebase-action@master
-              with:
-                  args: target:apply hosting test developomp-site-test
-              env:
-                  FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
             - name: Deploy to Firebase
               uses: w9jds/firebase-action@master
               with:
-                  args: deploy --only hosting:test
+                  args: deploy --only hosting
               env:
                   FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}