Merge pull request #74 from ciatph/dev

v1.1.4

Author: ciatph

.github/workflows/lint.yml

@@ -2,8 +2,8 @@ name: Lint Files
 
 on:
   push:
-    branches:
-      - '*'
+    branches-ignore:
+      - 'master'
 
 jobs:
   lint-client:
@@ -14,9 +14,9 @@ jobs:
         node-version: [14.x]
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
       - name: Use NodeJS ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install Dependencies and lint
@@ -33,13 +33,13 @@ jobs:
         node-version: [14.x]
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
       - name: Use NodeJS ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install Dependencies and lint
         run: |
           cd server
           npm install
-          npm run lint          
+          npm run lint

.github/workflows/release.yml

@@ -17,9 +17,11 @@ jobs:
         node-version: [14.x]
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.release.tag_name }}
       - name: Use NodeJS ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install dependencies and lint
@@ -32,9 +34,10 @@ jobs:
           cd client
           npm run build
       - name: Archive Development Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build
+          include-hidden-files: true
           path: |
             client/build
             client/.firebaserc
@@ -49,9 +52,11 @@ jobs:
         node-version: [14.x]
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.release.tag_name }}
       - name: Use NodeJS ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install Dependencies and lint
@@ -66,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build
       - name: Deploy to Firebase
@@ -77,6 +82,7 @@ jobs:
           FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
 
   deploy-server:
+    if: ${{ vars.IS_DEPLOY_SERVER == 'heroku' }}
     name: Deploy Server to Heroku
     needs: lint-server
     runs-on: ubuntu-latest
@@ -86,7 +92,9 @@ jobs:
       HEROKU_APP: ${{ secrets.HEROKU_APP }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.release.tag_name }}
       - run: |
           cat >~/.netrc <<EOF
           machine api.heroku.com
@@ -105,12 +113,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Checkout the repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.release.tag_name }}
       - name: Create temporary env variables
         # Replace these files with actual values during
         # runtime on 'docker-compose up'

client/.firebaserc

@@ -1,14 +1,14 @@
 {
   "projects": {
-    "default": "weaponsforge-dev"
+    "default": "users-admin-firebase"
   },
   "targets": {
-    "weaponsforge-dev": {
+    "users-admin-firebase": {
       "hosting": {
         "master": [
-          "fire-auth-users"
+          "adminusers-dev"
         ]
       }
     }
   }
-}
+}