Skip to content

Commit 2152ac9

Browse files
committed
Merge branch 'p2p'
2 parents 1997ddc + c1ce811 commit 2152ac9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+4588
-5331
lines changed

.dockerignore

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
target/
2-
.git/
3-
_*/
1+
.*
2+
_*
3+
contrib
4+
db*
5+
dist
6+
doc
47
Dockerfile
5-
LICENSE
6-
README.md
7-
RELEASE-NOTES.md
8-
TODO.md
8+
examples
9+
scripts
10+
target
11+
tests

.github/workflows/rust.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: electrs CI
1+
name: electrs
22

33
on: [push, pull_request]
44

55
jobs:
6-
electrs:
7-
name: electrs
6+
build:
7+
name: Build
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout sources
@@ -13,7 +13,7 @@ jobs:
1313
- name: Install rust
1414
uses: actions-rs/toolchain@v1
1515
with:
16-
components: rustfmt
16+
components: rustfmt, clippy
1717
profile: minimal
1818

1919
- name: Format
@@ -26,10 +26,27 @@ jobs:
2626
uses: actions-rs/cargo@v1
2727
with:
2828
command: build
29-
args: --locked --release --all
29+
args: --locked --all
3030

3131
- name: Test
3232
uses: actions-rs/cargo@v1
3333
with:
3434
command: test
35-
args: --locked --release --all
35+
args: --locked --all
36+
37+
- name: Clippy
38+
uses: actions-rs/cargo@v1
39+
with:
40+
command: clippy
41+
args: -- -D warnings
42+
43+
integration:
44+
name: Integration
45+
runs-on: ubuntu-latest
46+
steps:
47+
- name: Checkout
48+
uses: actions/checkout@v2
49+
- name: Build
50+
run: docker build . --rm -t electrs:tests
51+
- name: Test
52+
run: docker run -v $PWD/contrib/:/contrib -v $PWD/tests/:/tests --rm electrs:tests bash /tests/run.sh

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
target
2-
*db/
2+
/db*/
33
_*/
44
*.log
55
*.sublime*
@@ -8,3 +8,7 @@ _*/
88
.env
99
*.dat
1010
electrs.toml
11+
data/
12+
tests/bitcoin-*
13+
tests/bin
14+
.idea/

0 commit comments

Comments
 (0)