From c2c88ccb9fc1ddecda0663a83560d323ad4810ac Mon Sep 17 00:00:00 2001 From: Andrea Date: Wed, 24 Apr 2019 18:00:16 +0200 Subject: [PATCH 01/12] Add scoverage-maven-plugin dependency --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index de1bf1b411..777c90d3b5 100644 --- a/pom.xml +++ b/pom.xml @@ -228,6 +228,14 @@ + + org.scoverage + scoverage-maven-plugin + 1.3.0 + + ${scala.version} + + From 269f156697e231bdc0485c58fbd477984a4564ac Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 30 Apr 2019 10:28:04 +0200 Subject: [PATCH 02/12] Prepare for codecov --- .travis.yml | 4 ++++ README.md | 2 +- pom.xml | 23 +++++++++++++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6efd1d3b39..37996cdf12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ scala: - 2.11.12 env: - export LD_LIBRARY_PATH=/usr/local/lib + global: + - CODECOV_TOKEN="eadc3ab4-14c9-441a-841b-9a5ae511059f" before_install: - wget http://apache.crihan.fr/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.zip - unzip -qq apache-maven-3.6.0-bin.zip @@ -23,3 +25,5 @@ jdk: notifications: email: - ops@acinq.fr +after_success: + - bash <(curl -s https://codecov.io/bash) diff --git a/README.md b/README.md index 77692ff880..70f5997165 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Eclair Logo](.readme/logo.png) -[![Build Status](https://travis-ci.org/ACINQ/eclair.svg?branch=master)](https://travis-ci.org/ACINQ/eclair) +[![Build Status](https://travis-ci.org/araspitzu/eclair.svg?branch=master)](https://travis-ci.org/araspitzu/eclair) [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE) [![Gitter chat](https://img.shields.io/badge/chat-on%20gitter-red.svg)](https://gitter.im/ACINQ/eclair) diff --git a/pom.xml b/pom.xml index 777c90d3b5..ff3791efe3 100644 --- a/pom.xml +++ b/pom.xml @@ -229,12 +229,23 @@ - org.scoverage - scoverage-maven-plugin - 1.3.0 - - ${scala.version} - + org.jacoco + jacoco-maven-plugin + 0.5.8.201207111220 + + + + prepare-agent + + + + report + test + + report + + + From 98efa2e20866e8122d83d78092f214684e07a9fb Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 30 Apr 2019 10:29:23 +0200 Subject: [PATCH 03/12] Updating travis badge for araspitzu --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70f5997165..11ffbb183f 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Please see the latest [release note](https://github.com/ACINQ/eclair/releases) f ## Overview -![Eclair Demo](.readme/screen-1.png) +![Eclair Demo](.readme/screen-1.png)``` ## JSON API From 12c862d4fbe300e3f8aa773d3dccbbd3d11bb393 Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 30 Apr 2019 10:37:11 +0200 Subject: [PATCH 04/12] Remove codecov from travis file --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37996cdf12..6efd1d3b39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,6 @@ scala: - 2.11.12 env: - export LD_LIBRARY_PATH=/usr/local/lib - global: - - CODECOV_TOKEN="eadc3ab4-14c9-441a-841b-9a5ae511059f" before_install: - wget http://apache.crihan.fr/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.zip - unzip -qq apache-maven-3.6.0-bin.zip @@ -25,5 +23,3 @@ jdk: notifications: email: - ops@acinq.fr -after_success: - - bash <(curl -s https://codecov.io/bash) From d2ebbbf9200538cac78a567fbe0ac673ef15a019 Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 30 Apr 2019 10:37:59 +0200 Subject: [PATCH 05/12] Re-enable codecov from travis file --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6efd1d3b39..37996cdf12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ scala: - 2.11.12 env: - export LD_LIBRARY_PATH=/usr/local/lib + global: + - CODECOV_TOKEN="eadc3ab4-14c9-441a-841b-9a5ae511059f" before_install: - wget http://apache.crihan.fr/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.zip - unzip -qq apache-maven-3.6.0-bin.zip @@ -23,3 +25,5 @@ jdk: notifications: email: - ops@acinq.fr +after_success: + - bash <(curl -s https://codecov.io/bash) From 7f6a2f578840d31ec76682835f1cd852cb8591f3 Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 30 Apr 2019 10:41:08 +0200 Subject: [PATCH 06/12] remove codecov token --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37996cdf12..aeafa70634 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,6 @@ scala: - 2.11.12 env: - export LD_LIBRARY_PATH=/usr/local/lib - global: - - CODECOV_TOKEN="eadc3ab4-14c9-441a-841b-9a5ae511059f" before_install: - wget http://apache.crihan.fr/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.zip - unzip -qq apache-maven-3.6.0-bin.zip From bfe9723801a2f8435bf609364a9ee3d09520f522 Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 30 Apr 2019 11:11:11 +0200 Subject: [PATCH 07/12] Try using language=java in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aeafa70634..58c880b024 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required services: -docker dist: trusty -language: scala +language: java scala: - 2.11.12 env: From 16a7258e8fc4ee25e620066ba121c928d8281907 Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 30 Apr 2019 14:42:25 +0200 Subject: [PATCH 08/12] Move to scoverage 1.4.0-M5 and codecov (travis) --- .travis.yml | 2 +- pom.xml | 23 ++++++----------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58c880b024..5aae167283 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - export M2_HOME=$PWD/apache-maven-3.6.0 - export PATH=$M2_HOME/bin:$PATH script: - - mvn install + - mvn scoverage:report cache: directories: - .autoconf diff --git a/pom.xml b/pom.xml index ff3791efe3..fb7baadada 100644 --- a/pom.xml +++ b/pom.xml @@ -229,23 +229,12 @@ - org.jacoco - jacoco-maven-plugin - 0.5.8.201207111220 - - - - prepare-agent - - - - report - test - - report - - - + org.scoverage + scoverage-maven-plugin + 1.4.0-M5 + + ${scala.version} + From c045aef26216f9522d1787cf1d88c2b561dba9f3 Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 30 Apr 2019 15:44:35 +0200 Subject: [PATCH 09/12] Use lang scala in travis conf --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5aae167283..e037fd7592 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required services: -docker dist: trusty -language: java +language: scala scala: - 2.11.12 env: From 9707adbb45126ee1446e6f4885980b4bf88260cf Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 30 Apr 2019 17:08:58 +0200 Subject: [PATCH 10/12] Add badge to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 11ffbb183f..757d4af79f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ ![Eclair Logo](.readme/logo.png) [![Build Status](https://travis-ci.org/araspitzu/eclair.svg?branch=master)](https://travis-ci.org/araspitzu/eclair) +[![codecov](https://codecov.io/gh/araspitzu/eclair/branch/master/graph/badge.svg)](https://codecov.io/gh/araspitzu/eclair) [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE) [![Gitter chat](https://img.shields.io/badge/chat-on%20gitter-red.svg)](https://gitter.im/ACINQ/eclair) From aa569b5bc7c2de05101f425b14c6d9da08ee6614 Mon Sep 17 00:00:00 2001 From: araspitzu Date: Fri, 6 Sep 2019 14:19:41 +0200 Subject: [PATCH 11/12] Create .maintainerd --- .maintainerd | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 .maintainerd diff --git a/.maintainerd b/.maintainerd new file mode 100644 index 0000000000..40cafb6daa --- /dev/null +++ b/.maintainerd @@ -0,0 +1,71 @@ +# maintainerd can keep a log of all interactions with the Pull Request +# integrations as a comment in your PR. +log: true +# This contains all pull request related config options. +pullRequest: + # maintainerd will insert checkboxes and other information for the + # PR submitter to interact with. The preamble is the text inserted + # before all of that. + preamble: > + The maintainers of this repo require that all pull request submitters agree and adhere + to the following: + # Check boxes that will be inserted into the PR description. + items: + - prompt: > + I have read the [Contributor License Agreement](http://google.com), and indicate + my agreement by checking this box. + # If `default` is true, it will start in the checked state. + default: false + # If `required` is true, the PR will not be allowed to be merged before + # the checkbox is checked. + required: true + - prompt: All related documentation has been updated to reflect the changes made. + default: false + required: true + - prompt: My commit messages are cleaned up and ready to merge. + default: false + required: true + # maintainerd can ask the submitter whether the pull request represents a + # "major", "minor", "patch", or "documentation only" level change + semver: + enabled: true + # If `required` is true, the PR will not be allowed to be merged before + # at least one semver target is checked. + required: true +# maintainerd can also enforce certain rules on the commits that are submitted +commit: + subject: + # Length restrictions for the first line in each commit. + mustHaveLengthBetween: [8, 72] + # Regular expressions that must match the first line in each commit. + mustMatch: + - !!js/regexp /.*/ + # Regular expressions that must NOT match the first line in each commit. + mustNotMatch: + - !!js/regexp /^fixup!/ + # More rules for other lines in a commmit message. + message: + maxLines: 20 + minLines: 1 + enforceEmptySecondLine: true + linesMustHaveLengthBetween: [0, 72] +# maintainerd can also help you with managing issues. +issue: + # When a label is added to an issue... + onLabelAdded: + # And that label is equal to "not-enough-information"... + not-enough-information: + # A comment will be added to the issue... + action: comment + # With the following content. + data: | + This issue has been tagged with the `not-enough-information` label. + In order for us to help you, please respond with the following + information: + + - A description of the problem, including any relevant error output... + - blah, blah, blah + + If we receive no response to this issue within 2 weeks, the issue will + be closed. If that happens, feel free to re-open with the requested + information. Thank you! From 3fdec000f47a1e793fb3996b19da60aead8b30c0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 14 Dec 2020 05:44:52 +0000 Subject: [PATCH 12/12] Bump scalatest_2.11 from 3.0.5 to 3.3.0-SNAP3 Bumps [scalatest_2.11](https://github.com/scalatest/scalatest) from 3.0.5 to 3.3.0-SNAP3. - [Release notes](https://github.com/scalatest/scalatest/releases) - [Commits](https://github.com/scalatest/scalatest/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb7baadada..8a22dbd944 100644 --- a/pom.xml +++ b/pom.xml @@ -255,7 +255,7 @@ org.scalatest scalatest_${scala.version.short} - 3.0.5 + 3.3.0-SNAP3 test