Merge pull request #84 from BranchMetrics/main

[RELEASE] 02/20/23

Author: JagadeeshKaricherla-branch

.github/workflows/deploy-master.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
     inputs:
       branch_name:
-          description: 'Name of the branch'
+          description: 'Enter name of the branch'
           required: true
           default: 'main'
 
@@ -23,7 +23,7 @@ env:
 jobs:
   test-unit:
     name: Unit tests
-    runs-on: small
+    runs-on: [ self-hosted, standard ]
     steps:
       - name: Checkout ${{ github.ref_name }}
         uses: actions/checkout@v3
@@ -43,15 +43,27 @@ jobs:
         run: npm install
 
       - name: Run tests
-        run: echo "Running tests"
+        id: runTests
+        run: npm run test
+
+      - name : upload codecov
+        uses: codecov/codecov-action@v3
+        if: steps.runTests.outcome == 'success'
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   test-lint:
     name: Lint
-    runs-on: small
+    runs-on: [ self-hosted, standard ]
     steps:
       - name: Checkout ${{ github.ref_name }}
         uses: actions/checkout@v3
 
+      - name: Setup .npmrc
+        uses: bduff9/[email protected]
+        with:
+            dot-npmrc: ${{ secrets.DOT_NPMRC }}
+
       - name: Install Node ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
@@ -68,7 +80,7 @@ jobs:
     name: Deploy-QA
     needs: [test-unit,test-lint]
     if: ${{ github.ref_name == 'main' && github.event.pull_request.merged == true }}
-    runs-on: small
+    runs-on: [ self-hosted, standard ]
     steps:
       - name: Checkout ${{ github.ref_name }}
         uses: actions/checkout@v3
@@ -88,6 +100,7 @@ jobs:
         run: npm install
 
       - name: Call the Build bash script for QA
+        id: build
         run:  bash ${GITHUB_WORKSPACE}/deployment/build-qa.sh
 
       - name: Sync S3 Builds

.github/workflows/deploy-prod.yml

@@ -23,7 +23,7 @@ env:
 jobs:
   test-unit:
     name: Unit tests
-    runs-on: small
+    runs-on: [ self-hosted, standard ]
     steps:
       - name: Checkout ${{ github.ref_name }}
         uses: actions/checkout@v3
@@ -47,7 +47,7 @@ jobs:
 
   test-lint:
     name: Lint
-    runs-on: small
+    runs-on: [ self-hosted, standard ]
     steps:
       - name: Checkout ${{ github.ref_name }}
         uses: actions/checkout@v3
@@ -68,11 +68,11 @@ jobs:
       - name: Lint tests
         run: npm run lint
 
-  build-deploy-qa:
-    name: Deploy-QA
+  build-deploy-prod:
+    name: Deploy-Prod
     needs: [test-lint, test-unit]
     if: ${{ github.ref_name == 'production' && github.event.pull_request.merged == true }}
-    runs-on: small
+    runs-on: [ self-hosted, standard ]
     steps:
       - name: Checkout ${{ github.ref_name }}
         uses: actions/checkout@v3
@@ -101,9 +101,18 @@ jobs:
         if: steps.build.outcome == 'success'
         run: aws s3 sync ./dist s3://branch-builds/connected-sdk/
 
+      - name: Sync S3 CDN
+        id: s3synccdn
+        if: steps.s3syncbuilds.outcome == 'success'
+        run: aws s3 cp ./dist/branch-connected.min.js s3://branch-cdn/branch-connected.min.js
+
+      - name: Remove npmrc
+        run: rm -f ~/.npmrc
+
       - name: publish
         if: steps.s3synccdn.outcome == 'success'
         uses: JS-DevTools/npm-publish@v1
         with:
          token: ${{ secrets.NPM_TOKEN }}
 
+

.github/workflows/gate-keep.yml

@@ -17,7 +17,7 @@ env:
 jobs:
   test-unit:
     name: Unit tests
-    runs-on: small
+    runs-on: [ self-hosted, standard ]
     steps:
       - name: Checkout ${{ github.ref_name }}
         uses: actions/checkout@v3
@@ -41,7 +41,7 @@ jobs:
 
   test-lint:
     name: Lint
-    runs-on: small
+    runs-on: [ self-hosted, standard ]
     steps:
       - name: Checkout ${{ github.ref_name }}
         uses: actions/checkout@v3
@@ -66,7 +66,7 @@ jobs:
   test-build:
     name: Test-build
     needs: [test-unit,test-lint]
-    runs-on: small
+    runs-on: [ self-hosted, standard ]
     steps:
       - name: Checkout ${{ github.ref_name }}
         uses: actions/checkout@v3

.gitignore

@@ -31,3 +31,4 @@ tmp
 local-testbench
 index.html
 dist
+.nyc_output

.mocharc.js

@@ -0,0 +1,11 @@
+'use strict';
+
+// This is a JavaScript-based config file containing every Mocha option plus others.
+// If you need conditional logic, you might want to use this type of config,
+// e.g. set options via environment variables 'process.env'.
+// Otherwise, JSON or YAML is recommended.
+
+module.exports = {
+  require: ['./node_modules/google-closure-library', './test/branch-deps.js', './node_modules/jsdom-global/register.js', './test/test-utils.js', './node_modules/sinon/lib/sinon.js'],
+  spec: ['./test/1_utils.js']
+};

.nycrc

@@ -0,0 +1,29 @@
+{
+    "reporter": [
+        "text-summary",
+        "html",
+        "lcovonly"
+    ],
+    "include": [
+        "src/**"
+    ],
+    "exclude": [
+        "coverage/**",
+        "docs/**",
+        "packages/*/test{,s}/**",
+        "**/*.d.ts",
+        "test{,s}/**",
+        "test{,-*}.{js,cjs,mjs,ts}",
+        "**/*{.,-}test.{js,cjs,mjs,ts}",
+        "**/__tests__/**",
+        "**/{karma,rollup,webpack}.config.js",
+        "**/{babel.config,.eslintrc,.mocharc}.{js,cjs}",
+        "lib/browser/**",
+        "package-scripts.js",
+        "scripts/**",
+        "dist/**",
+        "src/onpage.js",
+        "src/extern.js",
+        "src/7_initialization.js"
+    ]
+}

CHANGELOG.md

@@ -3,3 +3,6 @@ All notable changes to the Branch C onnected SDK will be documented here.
 The Branch Connected SDK adheres to [Semantic Versioning](http://semver.org/).
 
 ## [VERSION] - unreleased
+
+## [1.2.0] - 2023-02-17
+– Fix GHA CI/CD

Makefile

@@ -39,6 +39,7 @@ test/branch-deps.js: $(SOURCES)
 		--f node_modules/google-closure-library/closure/goog/deps.js \
 		--root src \
 		--root test \
+		--exclude src/0_config.js \
 		--exclude test/branch-deps.js > test/branch-deps.js.tmp
 	echo "// jscs:disable" | cat - test/branch-deps.js.tmp | sed -e 's#src/0_config.js#test/web-config.js#' > test/branch-deps.js && \
 		rm test/branch-deps.js.tmp

deployment/build-qa.sh

@@ -20,6 +20,6 @@ NC='\033[0m'
 
   echo -en "${GREEN}call make ...${NC}\n"
   make
-
+  aws s3 sync ./dist s3://branch-builds/connected-sdk/
 # Exit prompts
 echo -en "${GREEN}Done build for QA release...${NC}\n"