Merge pull request #1164 from ONEARMY/fix/functions

build fixes - functions linting
ONEARMY · Jun 1, 2021 · a935a1f · a935a1f
2 parents db0a0f9 + a65eb8e
commit a935a1f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cypress/support/hooks.ts b/cypress/support/hooks.ts
@@ -64,8 +64,13 @@ beforeEach(() => {
  */
 after(() => {
   cy.clearServiceWorkers()
-  cy.wrap('Clear DB').then({ timeout: 30000 }, () => {
+  cy.wrap('Clear DB').then({ timeout: 120000 }, () => {
     return new Cypress.Promise((resolve, reject) => {
+      // force resolve in case of server issues (sometimes a bit flaky)
+      setTimeout(() => {
+        resolve()
+      }, 10000)
+      // clear the database
       TestDB.clearDB().then(
         () => resolve(),
         err => reject(err),

diff --git a/firebase.json b/firebase.json
@@ -45,8 +45,7 @@
   },
   "functions": {
     "predeploy": [
-      "yarn workspace functions install",
-      "yarn workspace functions lint",
+      "yarn install",
       "yarn workspace functions exec npm run build"
     ],
     "source": "functions"