ci: change make file to script (#334)

* ci: change make file to script * ci: change circleci to user new build script * ci: change circleci to user new build script for app * ci: change package file to use new npm script * ci: fix typo * revert: change build.prod to build for netlify * revert: remove ora for now * revert: add ora and remove circulair reference * ci: fix BUILD_HASH values * ci: add logoutput to show in stdout * feat: add new codegens to build pipe
xlayers · Nov 6, 2019 · 2d25560 · 2d25560
1 parent ae7ce96
commit 2d25560
Show file tree

Hide file tree

Showing 7 changed files with 228 additions and 193 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,9 +24,9 @@ jobs:
             - node_modules
           key: v1-dependencies-{{ checksum "package.json" }}
 
-      - run: make
+      - run: npm run build.library.all && npm run app.build.prod
 
-  "ci/build-sketch-ingestor":
+  "ci/build-all librarys":
     docker:
       - image: circleci/node:11.13.0
 
@@ -51,115 +51,7 @@ jobs:
           key: v1-dependencies-{{ checksum "package.json" }}
 
       - run:
-          command: npm run sketch-ingestor.build.prod
-
-  "ci/build-css-codegen":
-    docker:
-      - image: circleci/node:11.13.0
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "package.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-
-      - run: npm install
-      - run:
-          name: Install JUnit coverage reporter
-          command: npm i -D jest-junit
-
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
-
-      - run:
-          command: npm run csscodegen.build.prod
-
-  "ci/build-sketch-lib":
-    docker:
-      - image: circleci/node:11.13.0
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "package.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-
-      - run: npm install
-      - run:
-          name: Install JUnit coverage reporter
-          command: npm i -D jest-junit
-
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
-
-      - run:
-          command: npm run sketch-lib.build.prod
-
-  "ci/build-svg-codegen":
-    docker:
-      - image: circleci/node:11.13.0
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "package.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-
-      - run: npm install
-      - run:
-          name: Install JUnit coverage reporter
-          command: npm i -D jest-junit
-
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
-
-      - run:
-          command: npm run svgcodegen.build.prod
-
-  "ci/build-web-codegen":
-    docker:
-      - image: circleci/node:11.13.0
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "package.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-
-      - run: npm install
-      - run:
-          name: Install JUnit coverage reporter
-          command: npm i -D jest-junit
-
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
-
-      - run:
-          command: npm run webcodegen.build.prod
+          command: npm run build.library.all
 
   "ci/test":
     docker:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,17 @@
 {
   "workbench.colorCustomizations": {
-    "titleBar.activeBackground": "#ff2c70"
+    "activityBar.background": "#ff5f93",
+    "activityBar.foreground": "#15202b",
+    "activityBar.inactiveForeground": "#15202b99",
+    "activityBarBadge.background": "#53ff00",
+    "activityBarBadge.foreground": "#15202b",
+    "titleBar.activeBackground": "#ff2c70",
+    "titleBar.inactiveBackground": "#ff2c7099",
+    "titleBar.activeForeground": "#e7e7e7",
+    "titleBar.inactiveForeground": "#e7e7e799",
+    "statusBar.background": "#ff2c70",
+    "statusBarItem.hoverBackground": "#ff5f93",
+    "statusBar.foreground": "#e7e7e7"
   },
   "files.watcherExclude": {
     "**/.git/objects/**": true,
@@ -14,5 +25,6 @@
     "**/bower_components": true,
     "**/bazel-out": true,
     "**/dist": true
-  }
+  },
+  "peacock.color": "#ff2c70"
 }