Merge branch 'develop' of https://github.com/arkecosystem/core into d…

…evelop
ArkEcosystem · Sep 25, 2019 · 067da85 · 067da85
2 parents 2b5bc4d + bcce772
commit 067da85
Show file tree

Hide file tree

Showing 27 changed files with 273 additions and 309 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -5,15 +5,15 @@ on:
         branches:
             - "**"
     pull_request:
-        types: [ready_for_review, opened] # add synchronize to trigger builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges
+        types: [ready_for_review, synchronize, opened] # fix: synchronize triggers builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges
 
 jobs:
     crypto:
         runs-on: ubuntu-latest
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1

diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml
@@ -5,7 +5,7 @@ on:
         branches:
             - "**"
     pull_request:
-        types: [ready_for_review, synchronize, opened] # synchronize triggers builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges
+        types: [ready_for_review, synchronize, opened] # fix: synchronize triggers builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges
 
 jobs:
     bridgechain-registration:
@@ -24,7 +24,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -66,7 +66,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -108,7 +108,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -150,7 +150,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -192,7 +192,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -234,7 +234,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -276,7 +276,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -318,7 +318,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -360,7 +360,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -402,7 +402,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -444,7 +444,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -486,7 +486,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -528,7 +528,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -570,7 +570,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -612,7 +612,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -654,7 +654,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -696,7 +696,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,15 +5,15 @@ on:
         branches:
             - "**"
     pull_request:
-        types: [ready_for_review, synchronize, opened] # synchronize triggers builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges
+        types: [ready_for_review, synchronize, opened] # fix: synchronize triggers builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges
 
 jobs:
     unit:
         runs-on: ubuntu-latest
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -44,7 +44,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [10.x, 11.x, 12.x]
+                node-version: [10.x, 12.x]
 
         steps:
             - uses: actions/checkout@v1
@@ -71,3 +71,37 @@ jobs:
                   POSTGRES_USER: ark
                   POSTGRES_PASSWORD: password
                   POSTGRES_DB: ark_unitnet
+
+    e2e:
+        runs-on: ubuntu-latest
+
+        strategy:
+            matrix:
+                node-version: [10.x, 12.x]
+
+        steps:
+            - uses: actions/checkout@v1
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v1
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - name: Docker swarm init
+              run: docker swarm init
+            - name: Install and build packages
+              run: yarn setup && cd __tests__/e2e && ../../node_modules/.bin/tsc && yarn install --frozen-lockfile
+            - name: Generate files
+              run: node --version && cd __tests__/e2e && yarn generate -c 3 -v ${{ matrix.node-version }}
+            - name: Make scripts executable
+              run: sudo chmod +x __tests__/e2e/dist/docker* && sudo chmod +x __tests__/e2e/dist/node0/docker/testnet-e2e/entrypoint.sh && sudo chmod +x __tests__/e2e/dist/node1/docker/testnet-e2e/entrypoint.sh && sudo chmod +x __tests__/e2e/dist/node2/docker/testnet-e2e/entrypoint.sh && sudo chmod +x __tests__/e2e/dist/node0/ark.sh && sudo chmod +x __tests__/e2e/dist/node1/ark.sh && sudo chmod +x __tests__/e2e/dist/node2/ark.sh
+            - name: Docker init and start
+              run: cd __tests__/e2e/dist && ./docker-init.sh && ./docker-start.sh
+            - name: Wait 10 sec for docker containers to be up
+              run: sleep 10
+            - name: Run tests
+              run: cd __tests__/e2e && sudo chown -R $USER:$USER ./dist/ && yarn run-tests -s scenario1
+            - name: Output results - node0
+              run: cat __tests__/e2e/dist/node0/output.log && cat __tests__/e2e/dist/node0/errors.log
+            - name: Output results - node1
+              run: cat __tests__/e2e/dist/node1/output.log && cat __tests__/e2e/dist/node1/errors.log
+            - name: Output results - node2
+              run: cat __tests__/e2e/dist/node2/output.log && cat __tests__/e2e/dist/node2/errors.log
diff --git a/__tests__/e2e/README.md b/__tests__/e2e/README.md
@@ -23,13 +23,13 @@ Now to run the tests locally, you need to have Docker installed. Then, run this
 You can now run the configured tests like this :
 
     bin/e2e generate -c 3
-    sudo chmod +x dist/docker*
-    sudo chmod +x dist/node0/docker/testnet-e2e/entrypoint.sh
-    sudo chmod +x dist/node1/docker/testnet-e2e/entrypoint.sh
-    sudo chmod +x dist/node2/docker/testnet-e2e/entrypoint.sh
-    sudo chmod +x dist/node0/ark.sh
-    sudo chmod +x dist/node1/ark.sh
-    sudo chmod +x dist/node2/ark.sh
+    chmod +x dist/docker*
+    chmod +x dist/node0/docker/testnet-e2e/entrypoint.sh
+    chmod +x dist/node1/docker/testnet-e2e/entrypoint.sh
+    chmod +x dist/node2/docker/testnet-e2e/entrypoint.sh
+    chmod +x dist/node0/ark.sh
+    chmod +x dist/node1/ark.sh
+    chmod +x dist/node2/ark.sh
     cd dist && ./docker-init.sh && ./docker-start.sh && cd ..
     bin/e2e run-tests -s scenario1