Merge pull request #33 from 0hAodha/testCICD

Test CI

.github/workflows/deploy.yml

@@ -0,0 +1,22 @@
+name: Continuous Deployment
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - uses: actions/setup-node@main
+        with:
+          node-version: 12
+      
+      - name: Install dependencies
+        run: |
+          npm ci
+          cd functions && npm ci
+      
+      - name: Firebase deploy
+        run: npm run build && firebase deploy

.github/workflows/integrate.yml

@@ -2,7 +2,7 @@ name: Continuous Integration
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test_pull_request:
@@ -11,9 +11,16 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
-      - run: npm ci
-      - run: cd functions && npm ci
-      - run: npm run test
-      - run: cd ..
-      - run: npm run build
+          node-version: 16
+      
+      - name: Install dependencies
+        run: |
+          npm ci
+          cd functions && npm ci
+
+      - name: Run tests
+        run: npm run test
+        working-directory: ./functions
+
+      - name: Build environment
+        run: npm run build

.gitignore

@@ -64,4 +64,3 @@ node_modules/
 
 # dotenv environment variables file
 .env
-firebase.js

README.md

@@ -15,9 +15,6 @@ You will need to click the "Populate Database" and "Fetch Data" buttons to get d
 To kill the npm process do `CTRL + C` in your terminal. 
 To kill the firebase emulators run `fg` to bring the process to the foreground, then do `CTRL + C`
 
-# Committing 
-Make sure that you exclude the Firebase API key from any commits!
-
 # Links 
 Main site: [irishrailtracker.web.app](https://irishrailtracker.web.app/)