Merge pull request #49 from coreofscience/update-ci-stuffs

Update deploy instructions

Author: odarbelaeze

.firebaserc

@@ -0,0 +1,22 @@
+{
+  "projects": {
+    "prod": "coreofscience",
+    "dev": "coreofscience-dev"
+  },
+  "targets": {
+    "coreofscience-dev": {
+      "hosting": {
+        "tos": [
+          "tos-coreofscience-dev"
+        ]
+      }
+    },
+    "coreofscience": {
+      "hosting": {
+        "tos": [
+          "tos-coreofscience-prod-7f714"
+        ]
+      }
+    }
+  }
+}

.github/workflows/deploy-dev-site.yml

@@ -1,4 +1,4 @@
-name: Build and Deploy
+name: Build and Deploy Dev Site
 
 on:
   push:
@@ -19,25 +19,13 @@ jobs:
         with:
           node-version: 14.x
 
-      - name: Install dependencies
-        run: npm ci
-        env:
-          CI: true
-
       - name: Build
         run: |
+          npm ci
           npm run build
-          cat << EOF > .firebaserc
-          {
-              "projects": {
-                  "default": "coreofscience-dev"
-              }
-          }
-          EOF
-          npm run firebase -- target:apply hosting tos tos-coreofscience-dev
         env:
           CI: true
-          REACT_APP_APIKEY: ${{ secrets.DEV_API_KEY }}
+          REACT_APP_APIKEY: ${{ secrets.FIREBASE_WEB_API_KEY_DEV }}
           REACT_APP_AUTHDOMAIN: "coreofscience-dev.firebaseapp.com"
           REACT_APP_DATABASEURL: "https://coreofscience-dev.firebaseio.com"
           REACT_APP_PROJECTID: "coreofscience-dev"
@@ -49,4 +37,4 @@ jobs:
       - name: Deploy
         run: |
           npm install firebase-tools
-          npm run deploy -- --token=${{ secrets.FIREBASE_TOKEN }} -P coreofscience-dev
+          npm run deploy -- --token=${{ secrets.FIREBASE_TOKEN }} -P dev

.github/workflows/deploy-preview.yml

@@ -2,9 +2,6 @@ name: Deploy to Preview Channel
 
 on:
   pull_request:
-    # Optionally configure to run only for specific files. For example:
-    # paths:
-    # - "website/**"
 
 jobs:
   build_and_preview:
@@ -15,18 +12,9 @@ jobs:
       - run: |
           npm ci
           npm run build
-          # Firebase use --alias doesn't work
-          cat << EOF > .firebaserc
-          {
-              "projects": {
-                  "default": "coreofscience-dev"
-              }
-          }
-          EOF
-          npm run firebase -- target:apply hosting tos tos-coreofscience-dev
         env:
           CI: true
-          REACT_APP_APIKEY: ${{ secrets.DEV_API_KEY }}
+          REACT_APP_APIKEY: ${{ secrets.FIREBASE_WEB_API_KEY_DEV }}
           REACT_APP_AUTHDOMAIN: "coreofscience-dev.firebaseapp.com"
           REACT_APP_DATABASEURL: "https://coreofscience-dev.firebaseio.com"
           REACT_APP_PROJECTID: "coreofscience-dev"
@@ -40,6 +28,6 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT }}"
           expires: 30d
-          projectId: coreofscience-dev
+          projectId: dev
         env:
           FIREBASE_CLI_PREVIEWS: hostingchannels

.github/workflows/deploy-prod-site.yml

@@ -19,25 +19,13 @@ jobs:
         with:
           node-version: 14.x
 
-      - name: Install dependencies
-        run: npm ci
-        env:
-          CI: true
-
       - name: Build
         run: |
+          npm ci
           npm run build
-          cat << EOF > .firebaserc
-          {
-              "projects": {
-                  "default": "coreofscience"
-              }
-          }
-          EOF
-          npm run firebase -- target:apply hosting tos tos-coreofscience-prod-7f714
         env:
           CI: true
-          REACT_APP_APIKEY: ${{ secrets.PROD_API_KEY }}
+          REACT_APP_APIKEY: ${{ secrets.FIREBASE_WEB_API_KEY_PROD }}
           REACT_APP_AUTHDOMAIN: "coreofscience.firebaseapp.com"
           REACT_APP_DATABASEURL: "https://coreofscience.firebaseio.com"
           REACT_APP_PROJECTID: "coreofscience"
@@ -49,4 +37,4 @@ jobs:
       - name: Deploy
         run: |
           npm install firebase-tools
-          npm run deploy -- --token=${{ secrets.FIREBASE_TOKEN }} -P coreofscience
+          npm run deploy -- --token=${{ secrets.FIREBASE_TOKEN }} -P prod

.gitignore

@@ -31,6 +31,5 @@ yarn-error.log*
 .env.*
 
 # Firebase
-.firebaserc
 .firebase
-firebase-debug.log
+firebase-debug.log

firebase.json

@@ -1,10 +1,4 @@
 {
-  "database": {
-    "rules": "./firebase/database.rules.json"
-  },
-  "storage": {
-    "rules": "./firebase/storage.rules"
-  },
   "hosting": {
     "target": "tos",
     "public": "build",
@@ -15,9 +9,5 @@
         "destination": "/index.html"
       }
     ]
-  },
-  "firestore": {
-    "rules": "./firebase/firestore.rules",
-    "indexes": "./firebase/firestore.indexes.json"
   }
 }