Merge pull request #2 from hicommonwealth/develop

Develop update to master

.gitlab-ci.yml

@@ -44,7 +44,6 @@ variables:
     - cargo --version
     - sccache -s
   only:
-    - tags
     - master
     - /^v[0-9]+\.[0-9]+.*$/        # i.e. v1.0, v2.1rc1
     - schedules
@@ -53,6 +52,13 @@ variables:
   tags:
     - linux-docker
 
+.build-only:                       &build-only
+  only:
+    - master
+    - /^v[0-9]+\.[0-9]+.*$/        # i.e. v1.0, v2.1rc1
+    - web
+
+
 
 #### stage:                        test
 
@@ -145,10 +151,6 @@ test-srml-staking:                 &test-srml-staking
   except:
     variables:
       - $DEPLOY_TAG
-  only:
-    changes:
-      - .gitlab-ci.yml
-      - srml/staking/*
   script:
     - cd srml/staking/
     - time cargo test --release --verbose --no-default-features --features std
@@ -214,11 +216,13 @@ check-web-wasm:
     - time cargo web build -p substrate-trie
     - sccache -s
 
-.build-only:                       &build-only
-  only:
-    - master
-    - tags
-    - web
+node-exits:
+  stage:                           test
+  <<:                              *docker-env
+  except:
+    - /^v[0-9]+\.[0-9]+.*$/        # i.e. v1.0, v2.1rc1
+  script:
+    - ./ci/check_for_exit.sh
 
 #### stage:                        build
 
@@ -525,6 +529,8 @@ deploy-ue1-tag:
     name:                          parity-prod-ue1
 
 .validator-deploy:                 &validator-deploy
+  # script will fail if there is no artifacts/substrate/VERSION
+  <<:                              *build-only
   stage:                           flaming-fir
   dependencies:
     - build-linux-substrate

CODEOWNERS

@@ -1,4 +1,11 @@
-# Lists some code owners
+# Lists some code owners.
+#
+# A codeowner just oversees some part of the codebase. If an owned file is changed then the
+# corresponding codeowner receives a review request. An approval of the codeowner is
+# not required for merging a PR though.
+#
+# **This is pretty much an experiment at the moment**. Feel free to remove yourself at any time if
+# you do not want to receive review requests any longer.
 #
 # For details about syntax, see:
 # https://help.github.com/en/articles/about-code-owners
@@ -11,5 +18,51 @@
 #   are more recognizable on GitHub, you can use them for mentioning unlike an email.
 # - The latest matching rule, if multiple, takes precedence.
 
-/srml/contracts/ @pepyakin
+# Wasm execution and the wasm side of Substrate Runtime Interface
 /core/executor/ @pepyakin
+/core/sr-io/without_std.rs @pepyakin
+/core/sr-std/without_std.rs @pepyakin
+
+# Sandboxing capability of Substrate Runtime
+/core/sr-sandbox/ @pepyakin
+/core/primitives/src/sandbox.rs @pepyakin
+
+# Transaction pool
+/core/transaction-pool/ @tomusdrw
+
+# Offchain
+/core/offchain/ @tomusdrw
+/sr-io/src/offchain/ @tomusdrw
+
+# Everything that has RPC in it
+/core/rpc/ @tomusdrw
+/node/rpc/ @tomusdrw
+/node/rpc-client/ @tomusdrw
+/core/rpc-servers/ @tomusdrw
+
+# GRANDPA, BABE, consensus stuff
+/srml/babe/ @andresilva @DemiMarie-parity
+/srml/grandpa/ @andresilva @DemiMarie-parity
+/core/finality-grandpa/ @andresilva @DemiMarie-parity
+/core/consensus/babe/ @andresilva @DemiMarie-parity
+/core/consensus/slots/ @andresilva @DemiMarie-parity
+
+# Contracts
+/srml/contracts/ @pepyakin @thiolliere @jimpo
+/srml/contracts/src/wasm/runtime.rs @Robbepop
+
+# Inflation points
+/srml/staking/src/inflation.rs @thiolliere
+
+# NPoS and Governance
+/srml/staking/ @kianenigma
+/srml/election/ @kianenigma
+
+# End to end testing of substrate node
+/node/executor/ @kianenigma
+
+# Transaction weight stuff
+/core/sr-primitives/weights.rs @kianenigma
+
+# Support crates
+/srml/support/ @thiolliere @kianenigma

CONTRIBUTING.adoc

@@ -45,6 +45,21 @@ When reviewing a pull request, the end-goal is to suggest useful changes to the
 . There exists a somewhat cleaner/better/faster way of accomplishing the same feature/fix.
 . It does not fit well with some other contributors' longer-term vision for the project.
 
+=== Updating Polkadot as well
+
+If your PR changes the external APIs or interfaces used by Polkadot, **a corresponding PR on Polkadot must** be submitted as well. If you tagged the PR with `breaksapi` or `breaksconsensus` this is most certainly the case, in all other cases check for it by running step 1. 
+
+To update a corresponding Polkadot PR:
+
+0. Pull lastet Polkadot master (or clone it, if you haven't yet).
+1. Replace `polkadot-master` in all `Cargo.toml` with the name of the PR-branch - e.g. by running `find . -name "Cargo.toml" -exec sed -i "s/polkadot-master/PR_BRANCH/g" {}` (and to your repo, if the branch is not on mainline); Commit this change.
+2. Make the changes required to pass the build again.
+3. Submit all this as a PR against the Polkadot Repo, link that new PR in the existing substrate PR for reference
+4. Wait for reviews on both
+5. Once both PRs have been green lit, merge the Substrate PR into master and sync the changes onto the `polkadot-master` on mainline (push it). Now revert that first commit in your Polkadot PR, reverting the name back to `polkadot-master`, push and wait for the CI to confirm all is fine. Then merge the Polkadot PR.
+
+As there might be multiple pending PRs that might conflict with one another, a) you should not merge the substrate PR until the Polkadot PR has also been reviewed and b) both should be merged pretty quickly after another to not block others.
+
 == Helping out
 
 We use https://github.com/paritytech/substrate/labels[labels] to manage PRs and issues and communicate state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in https://github.com/paritytech/substrate/milestones[milestones]. Best way to get started is to a pick a ticket from the current milestone tagged https://github.com/paritytech/substrate/issues?q=is%3Aissue+is%3Aopen+label%3AQ2-easy[`easy`] or https://github.com/paritytech/substrate/issues?q=is%3Aissue+is%3Aopen+label%3AQ3-medium[`medium`] and get going or https://github.com/paritytech/substrate/issues?q=is%3Aissue+is%3Aopen+label%3AX1-mentor[`mentor`] and get in contact with the mentor offering their support on that larger task.