Merge pull request #1 from VeriBlock/fix-build

Fix build
VeriBlock · Jan 3, 2020 · ed7a289 · ed7a289
2 parents 3124bbc + 91e3024
commit ed7a289
Show file tree

Hide file tree

Showing 55 changed files with 231 additions and 561 deletions.
diff --git a/.github/workflows/btcdev.yml b/.github/workflows/btcdev.yml
@@ -15,6 +15,6 @@ jobs:
         with:
           name: veriblock/btcdev
           dockerfile: btcdev.Dockerfile
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ secrets.PUBLIC_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.PUBLIC_DOCKERHUB_PASSWORD }}
           tag_names: true
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -20,10 +20,9 @@ jobs:
       - name: Docker Push
         uses: elgohr/Publish-Docker-Github-Action@master
         with:
-          name: vbtc
+          name: veriblock/vbtc
           dockerfile: Dockerfile
-          username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
-          password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
-          registry: docker-internal.veriblock.com
+          username: ${{ secrets.PUBLIC_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.PUBLIC_DOCKERHUB_PASSWORD }}
           tag_names: true
           snapshot: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/prerelease-docker.yml b/.github/workflows/prerelease-docker.yml
@@ -15,6 +15,6 @@ jobs:
         with:
           name: veriblock/prerelease
           dockerfile: prerelease.Dockerfile
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          username: ${{ secrets.PUBLIC_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.PUBLIC_DOCKERHUB_PASSWORD }}
           tag_names: true
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 VeriBlock
 =========
 
-Fork created at [25d7e2e78137d07eb612c44d19b0d496050c947a](https://github.com/bitcoin/bitcoin/commit/25d7e2e78137d07eb612c44d19b0d496050c947a).
+Fork created at [8830cb58abc888144a1edb9b2fba427716cc45d8](https://github.com/bitcoin/bitcoin/commit/8830cb58abc888144a1edb9b2fba427716cc45d8).
 
 Bitcoin Core integration/staging tree
 =====================================

diff --git a/btcdev.Dockerfile b/btcdev.Dockerfile
@@ -152,6 +152,6 @@ RUN set -e; \
 
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
-RUN pip3 install --upgrade setuptools wheel bashlex compiledb
+RUN pip3 install --upgrade setuptools wheel bashlex compiledb gcovr
 
 WORKDIR /
diff --git a/e2e/README.md b/e2e/README.md
diff --git a/e2e/node1/.gitignore b/e2e/node1/.gitignore
diff --git a/e2e/node1/alt/altservice-default.properties b/e2e/node1/alt/altservice-default.properties
diff --git a/e2e/node1/alt/logback.groovy b/e2e/node1/alt/logback.groovy
diff --git a/e2e/node1/btc/bitcoin.conf b/e2e/node1/btc/bitcoin.conf
diff --git a/e2e/node1/docker-compose.yml b/e2e/node1/docker-compose.yml
diff --git a/e2e/node2/.gitignore b/e2e/node2/.gitignore