Skip to content

Commit 2a1dea4

Browse files
committed
Merge branch 'master' into features/storage-rework
# Conflicts: # crates/storage/src/lazy/mapping.rs # crates/storage/src/traits/optspec.rs
2 parents 58c21ac + 2bccebf commit 2a1dea4

File tree

32 files changed

+689
-129
lines changed

32 files changed

+689
-129
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
blank_issues_enabled: true
22
contact_links:
3-
- name: Support & Troubleshooting with the Stack Exchange Community
4-
url: https://substrate.stackexchange.com
3+
- name: Ask questions and find answers using our dedicated StackExchange site
4+
url: https://substrate.stackexchange.com/questions/tagged/ink/
55
about: |
66
For general questions you might already find an answer in our community.
7-
We encourage everyone to also share their understanding by answering questions for others.
7+
We encourage everyone to also share their understanding by answering questions for others too.

.gitlab-ci.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ variables:
3434
ALL_CRATES: "${PURELY_STD_CRATES} ${ALSO_WASM_CRATES}"
3535
DELEGATOR_SUBCONTRACTS: "accumulator adder subber"
3636
UPGRADEABLE_CONTRACTS: "forward-calls delegate-calls"
37-
VAULT_SERVER_URL: "https://vault.parity-mgmt-vault.parity.io"
38-
VAULT_AUTH_PATH: "gitlab-parity-io-jwt"
39-
VAULT_AUTH_ROLE: "cicd_gitlab_parity_${CI_PROJECT_NAME}"
4037

4138
workflow:
4239
rules:
@@ -84,31 +81,6 @@ workflow:
8481
tags:
8582
- kubernetes-parity-build
8683

87-
#### Vault secrets
88-
.vault-secrets: &vault-secrets
89-
secrets:
90-
CODECOV_P_TOKEN:
91-
vault: cicd/gitlab/parity/ink/CODECOV_P_TOKEN@kv
92-
file: false
93-
CODECOV_TOKEN:
94-
vault: cicd/gitlab/parity/ink/CODECOV_TOKEN@kv
95-
file: false
96-
GITHUB_EMAIL:
97-
vault: cicd/gitlab/parity/GITHUB_EMAIL@kv
98-
file: false
99-
GITHUB_USER:
100-
vault: cicd/gitlab/parity/GITHUB_USER@kv
101-
file: false
102-
GITHUB_PR_TOKEN:
103-
vault: cicd/gitlab/parity/GITHUB_PR_TOKEN@kv
104-
file: false
105-
PIPELINE_TOKEN:
106-
vault: cicd/gitlab/parity/ink/PIPELINE_TOKEN@kv
107-
file: false
108-
GITHUB_SSH_PRIV_KEY:
109-
vault: cicd/gitlab/parity/ink/GITHUB_SSH_PRIV_KEY@kv
110-
file: false
111-
11284
#### stage: lint
11385
#
11486
# Note: For all of these lints we `allow_failure` so that the rest of the build can
@@ -427,7 +399,6 @@ publish-docs:
427399
stage: publish
428400
<<: *kubernetes-env
429401
image: paritytech/tools:latest
430-
<<: *vault-secrets
431402
needs:
432403
- job: docs
433404
artifacts: true
@@ -481,7 +452,6 @@ publish-docs:
481452
fuzz-tests:
482453
stage: fuzz
483454
<<: *docker-env
484-
<<: *vault-secrets
485455
variables:
486456
# The QUICKCHECK_TESTS default is 100
487457
QUICKCHECK_TESTS: 5000

.images/badge.svg

Lines changed: 45 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)