Merge branch 'develop' into 'master'

Develop into master See merge request in3/c/in3-core!162
blockchainsllc · Mar 2, 2020 · 684fbce · 684fbce
2 parents bc0b7d8 + 85bc78e
commit 684fbce
Show file tree

Hide file tree

Showing 3,798 changed files with 19,640 additions and 2,868 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -40,13 +40,15 @@ jobs:
       - name: build
         run: cd build; make
       - name: test
-        run: cd build; make ccov-all && make ccov-all-report
+        run: cd build; make test
+      - name: summary
+        run: cd build; ../scripts/lcov_report.sh | xargs llvm-cov report
       - name: export
         run: |
           apt-get update
           apt-get install -y curl
           cd build
-          cat ccov/binaries.list | xargs llvm-cov export -instr-profile ccov/all-merged.profdata -format=lcov "-ignore-filename-regex=.*(third|test).*" > coverage.info
+          ../scripts/lcov_report.sh | xargs llvm-cov export  -format=lcov  > coverage.info
       - uses: codecov/codecov-action@v1.0.3
         with:
           token: ${{secrets.CODECOV_TOKEN}}

diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -15,7 +15,7 @@ jobs:
       - name: make
         run: cd build; make
       - name: test
-        run: cd test/bindings/wasm; npm i; npm test
+        run: cd wasm/test; npm i; npm test
 
   asmjs:
     runs-on: ubuntu-latest
@@ -29,4 +29,4 @@ jobs:
       - name: make
         run: cd build; make
       - name: test
-        run: cd test/bindings/wasm; npm i; npm test
+        run: cd wasm/test; npm i; npm test
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@ _build
 cmake-build-debug/
 .vscode/
 .idea/
+.settings/
 # Vim
 [._]*.s[a-v][a-z]
 [._]*.sw[a-p]
@@ -24,3 +25,6 @@ cmake-build-debug/
 bin/
 .classpath
 .project
+*.class
+target/
+.cproject