You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuweni.apache.org by to...@apache.org on 2020/05/09 04:50:39 UTC
[incubator-tuweni] branch master updated (17f2998 -> 9d327df)
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git.
from 17f2998 Add DNSDaemon to listen to DNS entries
new 3f455ac add a bit about dns-discovery
new bbf168b Add docker build to allow testing in isolation
new 9d327df use build image to get sodium already installed
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/master-pr-build.yml | 27 +++-------------------
PACKAGES.md | 4 ++++
build.sh | 9 +++-----
gradle/build.Dockerfile | 3 +++
.../docker/docker-compose.yml | 16 +++++++++----
gradle.properties => gradle/docker/test.Dockerfile | 7 +++---
6 files changed, 29 insertions(+), 37 deletions(-)
create mode 100644 gradle/build.Dockerfile
copy gradle.properties => gradle/docker/docker-compose.yml (64%)
copy gradle.properties => gradle/docker/test.Dockerfile (87%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 03/03: use build image to get sodium already
installed
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 9d327dfb5ff2a2f942ead5a5a5a85819872cd4bb
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Fri May 8 21:50:15 2020 -0700
use build image to get sodium already installed
---
.github/workflows/master-pr-build.yml | 27 +++------------------------
1 file changed, 3 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/master-pr-build.yml b/.github/workflows/master-pr-build.yml
index 0e796e7..e204e32 100644
--- a/.github/workflows/master-pr-build.yml
+++ b/.github/workflows/master-pr-build.yml
@@ -25,18 +25,11 @@ on:
jobs:
checks:
- runs-on: ubuntu-latest
- strategy:
- matrix:
- java: [ '1.11' ]
+ runs-on: tmio/tuweni-build:1.0
steps:
- uses: actions/checkout@v1
with:
submodules: true
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.java }}
- name: gradle checks
uses: eskatos/gradle-command-action@v1
with:
@@ -46,18 +39,11 @@ jobs:
# - name: Collect JUnit tests
# uses: danger/danger-js@9.1.8
assemble:
- runs-on: ubuntu-latest
- strategy:
- matrix:
- java: [ '1.11' ]
+ runs-on: tmio/tuweni-build:1.0
steps:
- uses: actions/checkout@v1
with:
submodules: true
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.java }}
- name: Cache Gradle packages
uses: actions/cache@v1
with:
@@ -81,18 +67,11 @@ jobs:
name: Libs
path: build/libs
test:
- runs-on: ubuntu-latest
- strategy:
- matrix:
- java: [ '1.11' ]
+ runs-on: tmio/tuweni-build:1.0
steps:
- uses: actions/checkout@v1
with:
submodules: true
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.java }}
- name: Cache Gradle packages
uses: actions/cache@v1
with:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 02/03: Add docker build to allow testing in
isolation
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit bbf168bf185d866b7d3c7ed008d3509c7d99e002
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Fri May 8 00:26:22 2020 -0700
Add docker build to allow testing in isolation
---
build.sh | 9 +++------
gradle/build.Dockerfile | 3 +++
gradle/docker/build.sh | 0
gradle/docker/docker-compose.yml | 22 ++++++++++++++++++++++
gradle/docker/test.Dockerfile | 10 ++++++++++
5 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/build.sh b/build.sh
index dfd55d8..fb73b54 100755
--- a/build.sh
+++ b/build.sh
@@ -10,9 +10,6 @@
# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
-
-COMMAND=$1
-if [ -z "$COMMAND" ];then
- COMMAND="build"
-fi
-docker run -it -v `pwd`:/home/gradle gradle:5.0-jdk11 gradle --no-daemon -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" $COMMAND
\ No newline at end of file
+cd gradle/docker
+docker build -t tuweni_test -f test.Dockerfile ../..
+docker-compose up
\ No newline at end of file
diff --git a/gradle/build.Dockerfile b/gradle/build.Dockerfile
index e69de29..ecdac8e 100644
--- a/gradle/build.Dockerfile
+++ b/gradle/build.Dockerfile
@@ -0,0 +1,3 @@
+FROM gradle:6.3-jdk11
+
+RUN apt-get update && apt-get install -y libsodium-dev && apt-get clean
\ No newline at end of file
diff --git a/gradle/docker/build.sh b/gradle/docker/build.sh
deleted file mode 100644
index e69de29..0000000
diff --git a/gradle/docker/docker-compose.yml b/gradle/docker/docker-compose.yml
index e69de29..c7eca70 100644
--- a/gradle/docker/docker-compose.yml
+++ b/gradle/docker/docker-compose.yml
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
+# file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
+# to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+version: "3.6"
+services:
+ test:
+ container_name: test
+ image: tuweni_test
+ volumes:
+ - ../../build/libs:/home/gradle/build/libs
+ command: gradle --no-daemon -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" assemble test
+ integration-test:
+ container_name: integration-test
+ image: tuweni_test
+ command: gradle --no-daemon -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" integrationTest
\ No newline at end of file
diff --git a/gradle/docker/test.Dockerfile b/gradle/docker/test.Dockerfile
index 89d8842..1f867c7 100644
--- a/gradle/docker/test.Dockerfile
+++ b/gradle/docker/test.Dockerfile
@@ -1,3 +1,13 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
+# file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
+# to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
FROM gradle:6.3-jdk11
RUN apt-get update && apt-get install -y libsodium-dev && apt-get clean
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org
[incubator-tuweni] 01/03: add a bit about dns-discovery
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 3f455ac2b76a1ba8c47adb673c1826ed139ce6e2
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Fri May 8 00:18:29 2020 -0700
add a bit about dns-discovery
---
PACKAGES.md | 4 ++++
gradle/build.Dockerfile | 0
gradle/docker/build.sh | 0
gradle/docker/docker-compose.yml | 0
gradle/docker/test.Dockerfile | 5 +++++
5 files changed, 9 insertions(+)
diff --git a/PACKAGES.md b/PACKAGES.md
index 724ab1c..610cbf4 100644
--- a/PACKAGES.md
+++ b/PACKAGES.md
@@ -44,6 +44,10 @@ Kotlin coroutine based implementation of the Ethereum ÐΞVp2p protocol.
These classes are included in the complete Tuweni distribution, or separately when using the gradle dependency `org.apache.tuweni:tuweni-devp2p` (`tuweni-devp2p.jar`).
+# Package org.apache.tuweni.discovery
+
+Implementation of DNS-based discovery of Ethereum Node Records after [EIP-1459](https://eips.ethereum.org/EIPS/eip-1459).
+
# Package org.apache.tuweni.eth
Classes and utilities for working in the Ethereum domain.
diff --git a/gradle/build.Dockerfile b/gradle/build.Dockerfile
new file mode 100644
index 0000000..e69de29
diff --git a/gradle/docker/build.sh b/gradle/docker/build.sh
new file mode 100644
index 0000000..e69de29
diff --git a/gradle/docker/docker-compose.yml b/gradle/docker/docker-compose.yml
new file mode 100644
index 0000000..e69de29
diff --git a/gradle/docker/test.Dockerfile b/gradle/docker/test.Dockerfile
new file mode 100644
index 0000000..89d8842
--- /dev/null
+++ b/gradle/docker/test.Dockerfile
@@ -0,0 +1,5 @@
+FROM gradle:6.3-jdk11
+
+RUN apt-get update && apt-get install -y libsodium-dev && apt-get clean
+
+COPY . /home/gradle
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org