From 63f4dd19e310dfb9666d45ee47d65306bf14bc4b Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Mon, 6 Mar 2023 09:15:20 +0000
Subject: [PATCH] Rejig actions

---
 .github/workflows/firebase-hosting-merge.yml    |  9 +++++----
 .../workflows/firebase-hosting-pull-request.yml | 17 -----------------
 .../workflows/scheduler-build-api-server.yml    |  2 +-
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 .github/workflows/firebase-hosting-pull-request.yml

diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
index 239931d..6d06175 100644
--- a/.github/workflows/firebase-hosting-merge.yml
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -1,11 +1,12 @@
-name: Deploy to Firebase Hosting on merge
-'on':
+name: Deploy to Firebase
+on:
   push:
-    branches:
-      - develop
+    branches: [ develop ]
+
 defaults:
   run:
     working-directory: web
+    
 jobs:
   build_and_deploy:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
deleted file mode 100644
index 7bbea5d..0000000
--- a/.github/workflows/firebase-hosting-pull-request.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by the Firebase CLI
-# https://github.com/firebase/firebase-tools
-
-name: Deploy to Firebase Hosting on PR
-'on': pull_request
-jobs:
-  build_and_preview:
-    if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: yarn install && yarn build
-      - uses: FirebaseExtended/action-hosting-deploy@v0
-        with:
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_RADIO_OTHERWAY }}'
-          projectId: radio-otherway
diff --git a/.github/workflows/scheduler-build-api-server.yml b/.github/workflows/scheduler-build-api-server.yml
index 1fc136a..6456cef 100644
--- a/.github/workflows/scheduler-build-api-server.yml
+++ b/.github/workflows/scheduler-build-api-server.yml
@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: Build Scheduler Docker Image
 
 on:
   push: