Merge pull request #17 from Waterclone/main

Merge develop to main

.github/workflows/PushFeaturePullDevMainWorkflow.yml

@@ -0,0 +1,38 @@
+on:
+  push:
+    branches:
+      - feature
+  pull_request:
+    branches: 
+      - main
+      - develop
+
+env:
+  NODE_VERSION: '16.x'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build
+        run: npm run build
+
+      - name: Run Tests
+        run: npm test
+
+      - name: Upload artifact for deployment
+        uses: actions/upload-artifact@v2
+        with:
+          name: node-app
+          path: .

.github/workflows/main_l5-m3-2.yml

@@ -1,7 +1,7 @@
 # Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
 # More GitHub Actions for Azure: https://github.com/Azure/actions
 
-name: Build and deploy Node.js app to Azure Web App - L5-M3-2
+name: Build and deploy to Azure Webapp - L5-M3-2
 
 on:
   push: