Add deployment option to CI workflow (codesandbox#2945)

* Add deployment option to CI workflow

* Auto retry for integration tests

* New deploy script

* Change deploy script

* Update executor

* Change step order

* Fix builds

* Fix fetch

* Force new deploy

* Filter more errors from sentry

* Remove the update notification message

* Filter another error

* Add staging deployment option

* Duplicate branches logic

* Revert "Duplicate branches logic"

This reverts commit 7c715a6.

* Fix filter for branches

Author: CompuIves

.circleci/config.yml

@@ -168,12 +168,6 @@ commands:
       - run:
           name: Build Application
           command: yarn build:prod
-      - run:
-          name: Mark Sentry release
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              node packages/app/scripts/sentry-create-release.js
-            fi
       - save_cache: *save_prod_build_cache
       - save_cache: *save_prod_result
       - run:
@@ -302,6 +296,34 @@ jobs:
     executor: docker_machine
     steps:
       - docker_cache
+  deploy-to-production:
+    executor: node
+    environment:
+      ENVIRONMENT: production
+    steps:
+      - checkout_with_cache
+      - restore_cache: *restore_deps_cache
+      - attach_workspace: *attach_deps_workspace
+      - run:
+          name: Mark Sentry release
+          command: node packages/app/scripts/sentry-create-release.js
+      - run:
+          name: Deploy Image
+          command: node packages/app/scripts/deploy.js
+      - run:
+          name: Deploy Sentry release
+          command: node packages/app/scripts/sentry-deploy-release.js
+  deploy-to-staging:
+    executor: node
+    environment:
+      ENVIRONMENT: staging
+    steps:
+      - checkout_with_cache
+      - restore_cache: *restore_deps_cache
+      - attach_workspace: *attach_deps_workspace
+      - run:
+          name: Deploy Image
+          command: node packages/app/scripts/deploy.js
 
 ################################
 # Workflows
@@ -334,3 +356,21 @@ workflows:
             - typecheck
             # - test-integrations
             - test-jest
+      - deploy-production-approval:
+          type: approval
+          requires:
+            - create-docker-image
+          filters:
+            branches:
+              only:
+                - master
+      - deploy-to-production:
+          requires:
+            - deploy-production-approval
+      - deploy-staging-approval:
+          type: approval
+          requires:
+            - create-docker-image
+      - deploy-to-staging:
+          requires:
+            - deploy-staging-approval

packages/app/integration-tests/browser-tests/browsers.test.js

@@ -4,6 +4,13 @@ const hash = require('child_process')
   .execSync('git rev-parse --short HEAD')
   .toString();
 
+const delay = ms =>
+  new Promise(resolve => {
+    setTimeout(() => {
+      resolve();
+    }, ms);
+  });
+
 function getCapabilities(browserInfo) {
   return {
     ...browserInfo,
@@ -77,8 +84,13 @@ usedDescribe('browser-tests', () => {
         os_version: '10',
         resolution: '1024x768',
       };
-
-      await testPageWitCapabilities(capabilities);
+      try {
+        await testPageWitCapabilities(capabilities);
+      } catch (e) {
+        await delay(10000);
+        // Retry
+        await testPageWitCapabilities(capabilities);
+      }
     }, 130000);
 
     test('safari', async () => {
@@ -90,8 +102,13 @@ usedDescribe('browser-tests', () => {
         os_version: 'High Sierra',
         resolution: '1024x768',
       };
-
-      await testPageWitCapabilities(capabilities);
+      try {
+        await testPageWitCapabilities(capabilities);
+      } catch (e) {
+        await delay(10000);
+        // Retry
+        await testPageWitCapabilities(capabilities);
+      }
     }, 130000);
 
     test.skip('android', async () => {

packages/app/scripts/deploy.js

@@ -0,0 +1,31 @@
+const fetch = require('cross-fetch');
+
+fetch('https://deployment-api.lbogdan.ro/image', {
+  method: 'POST',
+  headers: {
+    'Content-Type': 'application/json',
+    Authorization: `Bearer ${process.env.DEPLOY_TOKEN}`,
+  },
+  body: JSON.stringify({
+    env: process.env.ENVIRONMENT,
+    image: 'client',
+    tag: process.env.CIRCLE_SHA1.substr(0, 7),
+    deploy: true,
+  }),
+})
+  .then(x => {
+    if (!x.ok) {
+      throw new Error('Request failed');
+    }
+
+    return x.json();
+  })
+  .then(res => {
+    // eslint-disable-next-line
+    console.log(res);
+    process.exit(0);
+  })
+  .catch(e => {
+    console.error(e);
+    process.exit(1);
+  });

packages/app/scripts/sentry-create-release.js

@@ -12,7 +12,7 @@ try {
     `yarn sentry-cli releases --org=codesandbox -p frontend new "${VERSION}"`
   );
   childProcess.execSync(
-    `yarn sentry-cli releases --org=codesandbox set-commits "${VERSION}" --commit "CompuIves/codesandbox-client@${COMMIT_HASH}"`
+    `yarn sentry-cli releases --org=codesandbox set-commits "${VERSION}" --commit "codesandbox/codesandbox-client@${COMMIT_HASH}"`
   );
   console.log('Marked release');
 } catch (e) {

packages/app/src/app/index.js

@@ -19,7 +19,6 @@ import {
   notificationState,
   convertTypeToStatus,
 } from '@codesandbox/common/lib/utils/notifications';
-import { NotificationStatus } from '@codesandbox/notifications';
 import 'normalize.css';
 import theme from '@codesandbox/common/lib/theme';
 import { isSafari } from '@codesandbox/common/lib/utils/platform';
@@ -90,22 +89,6 @@ async function boot(overmind) {
       onUpdated: () => {
         debug('Updated SW');
         getSignal('setUpdateStatus')({ status: 'available' });
-
-        notificationState.addNotification({
-          title: 'CodeSandbox Update Available',
-          message:
-            'We just installed a new version of CodeSandbox, refresh to update!',
-          status: NotificationStatus.SUCCESS,
-          sticky: true,
-          actions: {
-            primary: [
-              {
-                run: () => document.location.reload(),
-                label: 'Reload Page',
-              },
-            ],
-          },
-        });
       },
       onInstalled: () => {
         debug('Installed SW');

packages/common/src/utils/analytics.ts

@@ -102,15 +102,28 @@ export async function initializeSentry(dsn: string) {
         if (
           event.stacktrace &&
           event.stacktrace.frames &&
-          event.stacktrace.frames[0] &&
-          event.stacktrace.frames[0].filename.endsWith(
-            'codesandbox.editor.main.js'
-          )
+          event.stacktrace.frames[0]
         ) {
-          // This is the spammy event that doesn't do anything: https://sentry.io/organizations/codesandbox/issues/1054971728/?project=155188&query=is%3Aunresolved
-          // Don't do anything with it right now, I can't seem to reproduce it for some reason.
-          // We need to add sourcemaps
-          return undefined;
+          const { filename } = event.stacktrace.frames[0];
+
+          if (
+            filename.includes('typescript-worker') &&
+            event.message &&
+            event.message.includes('too much recursion')
+          ) {
+            // https://sentry.io/organizations/codesandbox/issues/1293123855/events/b01ee0feb7e3415a8bb81b6a9df19152/?project=155188&query=is%3Aunresolved&statsPeriod=14d
+            return undefined;
+          }
+
+          if (
+            filename.endsWith('codesandbox.editor.main.js') ||
+            filename.startsWith('/extensions/')
+          ) {
+            // This is the spammy event that doesn't do anything: https://sentry.io/organizations/codesandbox/issues/1054971728/?project=155188&query=is%3Aunresolved
+            // Don't do anything with it right now, I can't seem to reproduce it for some reason.
+            // We need to add sourcemaps
+            return undefined;
+          }
         }
 
         const customError = ((hint && (hint.originalException as any)) || {})