fix: deploy contracts serially and enable CI tests (#700)

* fix: deploy serially * fix: syncing pr with v2
omgnetwork · Aug 31, 2020 · 7e71572 · 7e71572
1 parent cca00bd
commit 7e71572
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -374,7 +374,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - v2.0.0
 
   Deployment checks:
     jobs:
@@ -384,6 +384,8 @@ workflows:
               only:
                 - v2.0.0
       - Deploy to Rinkeby with Gnosis and Vault:
+          requires:
+            - Deploy to Rinkeby
           filters:
             branches:
               only:

diff --git a/.github/workflows/dispatch-sync-to-private.yml b/.github/workflows/dispatch-sync-to-private.yml
@@ -2,7 +2,7 @@ name: Dispatch sync event to plasma-contracts-private
 
 on:
   push:
-    branches: [master]
+    branches: [v2.0.0]
 
 jobs:
   dispatch-sync-event:

diff --git a/.github/workflows/sync-from-public-to-private.yml b/.github/workflows/sync-from-public-to-private.yml
@@ -27,7 +27,7 @@ jobs:
           # https://github.com/repo-sync/github-sync/blob/520596e97177727db1f2a1de14f4ded905624066/github-sync.sh#L23-L33
 
           readonly SOURCE_REPO="omgnetwork/plasma-contracts"
-          readonly SOURCE_BRANCH="master"
+          readonly SOURCE_BRANCH="v2.0.0"
           readonly DESTINATION_BRANCH="master"
 
           echo "Syncing ${DESTINATION_BRANCH} from branch ${SOURCE_BRANCH} of ${SOURCE_REPO}..."
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Dispatch sync event to plasma-contracts-private @@
     on:
       push:
-        branches: [master]
+        branches: [v2.0.0]
     jobs:
       dispatch-sync-event:
@@ Expand Down @@