Skip to content
This repository was archived by the owner on Jul 4, 2022. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'substrate/master' into develop
* substrate/master: (100 commits)
  Cargo.toml fixups for the release (#4975)
  Update the documentation for `secp256k1_ecdsa_recover*` (#5019)
  Remove `NetworkSpecialization` (#4665)
  Add tests & Service's Configuration has optional fields that shouldn't be optional (#4842)
  Add gitlab job for publishing draft releases (#5009)
  Removes use of sc_client::Client from sc_consensus_babe (#5014)
  Wait for RPC server to cleanup on shutdown (#5004)
  Open one substream for each notifications protocol (#4909)
  node, node-template: disable GRANDPA observer (#5011)
  Make sure we use libp2p 0.16.1 (#5017)
  aura: remove unneeded SlotDuration struct and rename digest -> digests (#4958)
  babe: directly using append_u64 in transcript instead of to_le_bytes (#5005)
  Un-deprecate ValidateUnsigned (#5003)
  CI: Add example CI job template to .gitlab-ci.yml (#5012)
  Benchmark macro (#4962)
  Remove deprecated API (#4993)
  Unsigned transactions should also note weight (#4998)
  Offchain Workers: Example Pallet (#4989)
  Clean up the public API of sc-network-gossip (#5001)
  `vesting_balance` returns `Option` (#4987)
  ...

# Conflicts:
#	Cargo.lock
#	bin/node-template/node/src/service.rs
#	bin/node-template/pallets/template/src/mock.rs
#	bin/node-template/runtime/Cargo.toml
#	bin/node/cli/Cargo.toml
#	bin/node/cli/bin/main.rs
#	bin/node/cli/src/service.rs
#	bin/node/cli/tests/check_block_works.rs
#	bin/node/cli/tests/purge_chain_works.rs
#	bin/node/cli/tests/running_the_node_and_interrupt.rs
#	bin/node/executor/Cargo.toml
#	bin/node/executor/src/lib.rs
#	bin/node/executor/tests/basic.rs
#	bin/node/runtime/Cargo.toml
#	bin/node/runtime/src/lib.rs
#	bin/node/testing/Cargo.toml
#	bin/node/testing/benches/import.rs
#	bin/node/transaction-factory/src/lib.rs
#	bin/utils/subkey/Cargo.toml
#	client/authority-discovery/Cargo.toml
#	client/cli/Cargo.toml
#	client/cli/src/lib.rs
#	client/cli/src/params.rs
#	client/consensus/aura/Cargo.toml
#	client/executor/wasmtime/src/instance_wrapper.rs
#	client/finality-grandpa/src/communication/mod.rs
#	client/finality-grandpa/src/lib.rs
#	client/finality-grandpa/src/observer.rs
#	client/finality-grandpa/src/tests.rs
#	client/informant/Cargo.toml
#	client/network-gossip/Cargo.toml
#	client/network-gossip/src/bridge.rs
#	client/network/Cargo.toml
#	client/network/src/behaviour.rs
#	client/network/src/protocol.rs
#	client/network/src/protocol/block_requests.rs
#	client/network/src/protocol/generic_proto/behaviour.rs
#	client/network/src/protocol/generic_proto/handler.rs
#	client/network/src/protocol/light_client_handler.rs
#	client/network/src/protocol/schema/api.v1.proto
#	client/network/src/service.rs
#	client/network/src/transport.rs
#	client/peerset/src/lib.rs
#	client/rpc-api/Cargo.toml
#	client/service/Cargo.toml
#	client/service/src/builder.rs
#	client/service/src/chain_ops.rs
#	client/service/src/lib.rs
#	client/telemetry/Cargo.toml
#	client/transaction-pool/Cargo.toml
#	client/transaction-pool/graph/Cargo.toml
#	client/transaction-pool/graph/src/listener.rs
#	client/transaction-pool/graph/src/pool.rs
#	client/transaction-pool/src/lib.rs
#	client/transaction-pool/src/testing/pool.rs
#	docs/CODE_OF_CONDUCT.adoc
#	docs/CONTRIBUTING.adoc
#	docs/SECURITY.md
#	docs/Structure.adoc
#	frame/assets/src/lib.rs
#	frame/aura/src/mock.rs
#	frame/authorship/src/lib.rs
#	frame/babe/src/mock.rs
#	frame/balances/src/benchmarking.rs
#	frame/balances/src/lib.rs
#	frame/balances/src/tests.rs
#	frame/balances/src/tests_local.rs
#	frame/collective/src/lib.rs
#	frame/contracts/src/exec.rs
#	frame/contracts/src/tests.rs
#	frame/democracy/src/lib.rs
#	frame/elections-phragmen/src/lib.rs
#	frame/elections/src/mock.rs
#	frame/evm/Cargo.toml
#	frame/example/src/lib.rs
#	frame/executive/Cargo.toml
#	frame/executive/src/lib.rs
#	frame/finality-tracker/src/lib.rs
#	frame/generic-asset/src/lib.rs
#	frame/generic-asset/src/mock.rs
#	frame/grandpa/src/mock.rs
#	frame/identity/src/benchmarking.rs
#	frame/identity/src/lib.rs
#	frame/im-online/src/mock.rs
#	frame/indices/src/lib.rs
#	frame/indices/src/mock.rs
#	frame/membership/src/lib.rs
#	frame/nicks/src/lib.rs
#	frame/offences/src/mock.rs
#	frame/randomness-collective-flip/src/lib.rs
#	frame/recovery/src/mock.rs
#	frame/scored-pool/src/mock.rs
#	frame/session/src/mock.rs
#	frame/society/src/lib.rs
#	frame/society/src/mock.rs
#	frame/staking/Cargo.toml
#	frame/staking/src/lib.rs
#	frame/staking/src/mock.rs
#	frame/support/src/traits.rs
#	frame/system/src/lib.rs
#	frame/timestamp/Cargo.toml
#	frame/timestamp/src/benchmarking.rs
#	frame/timestamp/src/lib.rs
#	frame/transaction-payment/src/lib.rs
#	frame/treasury/src/lib.rs
#	frame/utility/src/lib.rs
#	frame/vesting/src/lib.rs
#	primitives/allocator/src/freeing_bump.rs
#	primitives/core/Cargo.toml
#	primitives/finality-grandpa/Cargo.toml
#	primitives/runtime/Cargo.toml
#	primitives/runtime/src/generic/unchecked_extrinsic.rs
#	primitives/runtime/src/testing.rs
#	primitives/state-machine/Cargo.toml
#	primitives/transaction-pool/src/pool.rs
#	test-utils/runtime/src/lib.rs
#	test-utils/runtime/transaction-pool/Cargo.toml
#	utils/browser/Cargo.toml
#	utils/grafana-data-source/test/Cargo.toml
#	utils/prometheus/Cargo.toml
  • Loading branch information
roy-powerfinance committed Feb 25, 2020
commit eaff5f71e8499cab7b162ee2dcb88b213a149e3e
26 changes: 25 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@
# pipelines can be triggered manually in the web
# setting DEPLOY_TAG will only deploy the tagged image

# SAMPLE JOB TEMPLATE - This is not a complete example but is enough to build a
# simple CI job. For full documentation, visit https://docs.gitlab.com/ee/ci/yaml/
#
# my-example-job:
# stage: test # One of the stages listed below this job (required)
# image: parity/tools:latest # Any docker image (required)
# allow_failure: true # Allow the pipeline to continue if this job fails (default: false)
# dependencies:
# - build-rust-doc-release # Any jobs that are required to run before this job (optional)
# variables:
# MY_ENVIRONMENT_VARIABLE: "some useful value" # Environment variables passed to the job (optional)
# script:
# - echo "List of shell commands to run in your job"
# - echo "You can also just specify a script here, like so:"
# - ./scripts/gitlab/my_amazing_script.sh

stages:
- test
Expand Down Expand Up @@ -524,7 +539,16 @@ publish-gh-doc:
after_script:
- rm -vrf ${HOME}/.gitconfig


publish-draft-release:
stage: publish
image: parity/tools:latest
only:
- tags
- /^v[0-9]+\.[0-9]+\.[0-9]+.*$/
script:
- ./scripts/gitlab/publish_draft_release.sh
interruptible: true
allow_failure: true

.deploy-template: &deploy
stage: kubernetes
Expand Down
2 changes: 1 addition & 1 deletion .maintain/kubernetes/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
app: {{ .Values.GitlabEnvSlug | default .Values.app }}
sessionAffinity: None
type: NodePort
# don't route exteral traffic to non-local pods
# don't route external traffic to non-local pods
externalTrafficPolicy: Local
{{- else if .Values.validator.keys }}
{{- $root := . -}}
Expand Down
2 changes: 1 addition & 1 deletion .maintain/kubernetes/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ validator: {}
# substrate-1-node-key <node-secret-key>
#
# pod names are canonical. changing these or providing different amount of
# keys than the replicas count will lead to behavior noone ever has
# keys than the replicas count will lead to behavior no one ever has
# experienced before.


Expand Down
Loading