Merge pull request #42 from globality-corp/update-circleci

update-circleci
globality-corp · May 14, 2021 · 2abcc61 · 2abcc61
2 parents 43b7336 + 547e520
commit 2abcc61
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,11 +1,10 @@
 defaults: &defaults
   working_directory: ~/repo
   docker:
-    - image: circleci/node:14.15.4
+    - image: circleci/node:14.16.1
 
 whitelist: &whitelist
-  paths:
-    .
+  paths: .
 
 version: 2
 jobs:
@@ -90,7 +89,7 @@ jobs:
             sed  -i '/version/s/[^.]*$/'"0-dev${CIRCLE_BUILD_NUM}\",/" package.json
             npm publish
 
-  deploy:
+  publish_library_to_npmjs:
     <<: *defaults
 
     steps:
@@ -101,49 +100,61 @@ jobs:
           name: Publish to NPM
           command: npm publish
 
+  publish_library_to_jfrog:
+    <<: *defaults
+
+    steps:
+      - attach_workspace:
+          at: ~/repo
+
+      - run:
+          name: Publish to JFrog
+          command: |
+            echo "Not publishing package to JFrog"
+
 workflows:
   version: 2
 
   build:
     jobs:
       - checkout:
           context:
-          - Globality-Common
+            - Globality-Common
       - lint:
           context:
-          - Globality-Common
+            - Globality-Common
           requires:
             - checkout
       - test:
           context:
-          - Globality-Common
+            - Globality-Common
           requires:
             - checkout
       - build:
           context:
-          - Globality-Common
+            - Globality-Common
           requires:
             - lint
             - test
       - deploy_rc:
           context:
-          - Globality-Common
+            - Globality-Common
           requires:
             - build
 
   release:
     jobs:
       - checkout:
           context:
-          - Globality-Common
+            - Globality-Common
           filters:
             tags:
               only: /[0-9]+(\.[0-9]+)*/
             branches:
               ignore: /.*/
       - lint:
           context:
-          - Globality-Common
+            - Globality-Common
           filters:
             tags:
               only: /[0-9]+(\.[0-9]+)*/
@@ -153,7 +164,7 @@ workflows:
             - checkout
       - test:
           context:
-          - Globality-Common
+            - Globality-Common
           filters:
             tags:
               only: /[0-9]+(\.[0-9]+)*/
@@ -163,17 +174,27 @@ workflows:
             - checkout
       - build:
           context:
-          - Globality-Common
+            - Globality-Common
           filters:
             tags:
               only: /[0-9]+(\.[0-9]+)*/
             branches:
               ignore: /.*/
           requires:
             - test
-      - deploy:
+      - publish_library_to_npmjs:
+          context:
+            - Globality-Common
+          filters:
+            tags:
+              only: /[0-9]+(\.[0-9]+)*/
+            branches:
+              ignore: /.*/
+          requires:
+            - build
+      - publish_library_to_jfrog:
           context:
-          - Globality-Common
+            - Globality-Common
           filters:
             tags:
               only: /[0-9]+(\.[0-9]+)*/

diff --git a/.globality/build.json b/.globality/build.json
@@ -4,5 +4,5 @@
     "open_source": true
   },
   "type": "node-module",
-  "version": "2021.3.1"
+  "version": "2021.19.1"
 }