Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Commit ff398fe

Browse files
authored
V2.5.6 stable (#10961)
- Fix cargo audit (#10921) - Add support for Energy Web Foundation's new chains (#10957) - Kaspersky AV whitelisting (#10919) - Avast whitelist script (#10900) - Docker images renaming (#10863) - Remove excessive warning (#10831) - Allow --nat extip:your.host.here.org (#10830) - When updating the client or when called from RPC, sleep should mean sleep (#10814) - added new ropsten-bootnode and removed old one (#10794) - ethkey no longer uses byteorder (#10786) - Do not drop the peer with None difficulty (#10772) - docs: Update Readme with TOC, Contributor Guideline. Update Cargo package descriptions (#10652)
1 parent 3ebc769 commit ff398fe

File tree

58 files changed

+1126
-445
lines changed

Some content is hidden

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

58 files changed

+1126
-445
lines changed

.github/CONTRIBUTING.md

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,42 @@ Also, try to include **steps to reproduce** the issue and expand on the **actual
2424

2525
If you would like to contribute to Parity Ethereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity-ethereum/compare).
2626

27-
Please, refer to the [Coding Guide](https://wiki.parity.io/Coding-guide) in our wiki for more details about hacking on Parity.
27+
### Labels & Milestones
28+
29+
We use [labels](https://github.com/paritytech/parity-ethereum/labels) to manage PRs and issues and communicate the state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in [milestones](https://github.com/paritytech/parity-ethereum/milestones). Best way to get started is to a pick a ticket from the current milestone tagged [`easy`](https://github.com/paritytech/parity-ethereum/labels/Q2-easy%20%F0%9F%92%83) and get going, or [`mentor`](https://github.com/paritytech/parity-ethereum/labels/Q1-mentor%20%F0%9F%95%BA) and get in contact with the mentor offering their support on that larger task.
30+
31+
### Rules
32+
33+
There are a few basic ground-rules for contributors (including the maintainer(s) of the project):
34+
35+
* **No pushing directly to the master branch**.
36+
* **All modifications** must be made in a **pull-request** to solicit feedback from other contributors.
37+
* Pull-requests cannot be merged before CI runs green and two reviewers have given their approval.
38+
* Contributors should adhere to the [Parity Ethereum Style Guide](https://wiki.parity.io/Parity-Ethereum-Style-Guide).
39+
40+
### Recommendations
41+
42+
* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into Parity Ethereum [Projects](https://github.com/paritytech/parity-ethereum/projects).
43+
* **Remove stale branches periodically**
44+
45+
### Preparing Pull Requests
46+
47+
* If your PR does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/paritytech/parity-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22).
48+
49+
* Once a PR is ready for review please add the [`pleasereview`](https://github.com/paritytech/parity-ethereum/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3A%22A0-pleasereview+%F0%9F%A4%93%22+) label.
50+
51+
### Reviewing Pull Requests*:
52+
53+
* At least two reviewers are required to review PRs (even for PRs tagged [`insubstantial`](https://github.com/paritytech/parity-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22)).
54+
55+
When doing a review, make sure to look for any:
56+
57+
* Buggy behavior.
58+
* Undue maintenance burden.
59+
* Breaking with house coding style.
60+
* Pessimization (i.e. reduction of speed as measured in the projects benchmarks).
61+
* Breaking changes should be carefuly reviewed and tagged as such so they end up in the [changelog](../CHANGELOG.md).
62+
* Uselessness (i.e. it does not strictly add a feature or fix a known issue).
2863

2964
## License.
3065

.gitlab-ci.yml

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ variables:
4646
sccache --start-server
4747
- sccache -s
4848
after_script:
49-
# sccache debug info
49+
# sccache debug info
5050
- if test -e sccache_debug.log;
5151
then
5252
echo "_____All crate-types:_____";
@@ -147,32 +147,32 @@ test-linux-nightly:
147147

148148
build-android:
149149
<<: *build-on-linux
150-
image: parity/rust-parity-ethereum-android-build:stretch
150+
image: parity/parity-ci-android:stretch
151151
variables:
152152
CARGO_TARGET: armv7-linux-androideabi
153153

154154
build-linux:
155155
<<: *build-on-linux
156-
only: *releaseable_branches
156+
# only: *releaseable_branches
157157

158158
build-linux-i386:
159159
<<: *build-on-linux
160160
only: *releaseable_branches
161-
image: parity/rust-parity-ethereum-build:i386
161+
image: parity/parity-ci-i386:latest
162162
variables:
163163
CARGO_TARGET: i686-unknown-linux-gnu
164164

165165
build-linux-arm64:
166166
<<: *build-on-linux
167167
only: *releaseable_branches
168-
image: parity/rust-parity-ethereum-build:arm64
168+
image: parity/parity-ci-arm64:latest
169169
variables:
170170
CARGO_TARGET: aarch64-unknown-linux-gnu
171171

172172
build-linux-armhf:
173173
<<: *build-on-linux
174174
only: *releaseable_branches
175-
image: parity/rust-parity-ethereum-build:armhf
175+
image: parity/parity-ci-armhf:latest
176176
variables:
177177
CARGO_TARGET: armv7-unknown-linux-gnueabihf
178178

@@ -310,16 +310,31 @@ publish-awss3-release:
310310
- linux-docker
311311

312312
publish-docs:
313-
stage: publish
314-
image: parity/rust-parity-ethereum-docs:xenial
313+
stage: publish
314+
image: parity/parity-ci-docs:latest
315315
only:
316316
- tags
317317
except:
318318
- nightly
319-
cache: {}
320-
dependencies: []
319+
cache: {}
320+
dependencies: []
321321
script:
322322
- scripts/gitlab/publish-docs.sh
323323
tags:
324324
- linux-docker
325325
allow_failure: true
326+
327+
publish-av-whitelist:
328+
stage: publish
329+
<<: *no_git
330+
only: *releaseable_branches
331+
except:
332+
variables:
333+
- $SCHEDULE_TAG == "nightly"
334+
cache: {}
335+
dependencies:
336+
- build-windows
337+
script:
338+
- scripts/gitlab/publish-av-whitelists.sh
339+
tags:
340+
- linux-docker

0 commit comments

Comments
 (0)