.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
+            - name: Checkout Repo
-            - run: cd source && yarn install && yarn build # install dependencies and build site
+              uses: actions/checkout@master
-            - run: /usr/local/bin/npx firebase-tools target:apply hosting dev developomp-site # Configure target
+            - name: Install dependencies and build site
-            - uses: FirebaseExtended/action-hosting-deploy@v0
+              run: cd source && yarn install && yarn build
+            - name: Apply target
+              uses: w9jds/firebase-action@master
               with:
-                  repoToken: "${{ secrets.GITHUB_TOKEN }}"
+                  args: target:apply hosting dev developomp-site
-                  firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_DEVELOPOMP_SITE }}"
+              env:
-                  channelId: live
+                  FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
-                  projectId: developomp-site
+            - name: Deploy to Firebase
-                  target: dev
+              uses: w9jds/firebase-action@master
+              with:
+                  args: deploy --only hosting
+              env:
+                  FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}