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

Commit 3cdda45

Browse files
rphmeierrphmeier
committed
Merge branch 'master' into rh-async-backing-feature
2 parents 569242a + 4596a21 commit 3cdda45

File tree

437 files changed

+15432
-7291
lines changed

Some content is hidden

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

437 files changed

+15432
-7291
lines changed

‎.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,8 @@ updates:
1919
- dependency-name: "sub-tokens"
2020
schedule:
2121
interval: "daily"
22+
- package-ecosystem: github-actions
23+
directory: '/'
24+
labels: ["A2-insubstantial", "B0-silent", "C1-low 📌", "E3-dependencies"]
25+
schedule:
26+
interval: daily

‎.github/pr-custom-review.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,20 @@ rules:
1919
check_type: changed_files
2020
condition:
2121
include: .*
22-
exclude: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$
22+
# excluding files from 'Runtime files' and 'CI team' rules
23+
exclude: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
2324
min_approvals: 2
2425
teams:
2526
- core-devs
2627

28+
- name: CI team
29+
check_type: changed_files
30+
condition:
31+
include: ^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
32+
min_approvals: 2
33+
teams:
34+
- ci
35+
2736
prevent-review-request:
2837
teams:
2938
- core-devs

‎.github/workflows/check-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout sources
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313
with:
1414
fetch-depth: 0
1515
ref: ${{ github.event.pull_request.head.ref }}

‎.github/workflows/extrinsic-ordering-check-from-bin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Checkout sources
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
3232

3333
- name: Fetch binary
3434
run: |

‎.github/workflows/honggfuzz.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout sources
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313
with:
1414
fetch-depth: 1
1515

@@ -48,7 +48,7 @@ jobs:
4848
runs-on: ubuntu-latest
4949
steps:
5050
- name: Checkout sources
51-
uses: actions/checkout@v2
51+
uses: actions/checkout@v3
5252
with:
5353
fetch-depth: 1
5454

@@ -94,7 +94,7 @@ jobs:
9494
runs-on: ubuntu-latest
9595
steps:
9696
- name: Checkout sources
97-
uses: actions/checkout@v2
97+
uses: actions/checkout@v3
9898
with:
9999
fetch-depth: 1
100100

‎.github/workflows/publish-docker-manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout sources
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121
- name: Set up Docker Buildx
2222
uses: docker/setup-buildx-action@v1
2323
- name: Cache Docker layers

‎.github/workflows/publish-docker-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout sources
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
1414
- name: Set up Docker Buildx
1515
uses: docker/setup-buildx-action@v1
1616
- name: Cache Docker layers

‎.github/workflows/publish-draft-release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runtime: ["polkadot", "kusama", "westend", "rococo"]
2828
steps:
2929
- name: Checkout sources
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
3131

3232
- name: Cache target dir
3333
uses: actions/cache@v2
@@ -40,9 +40,9 @@ jobs:
4040
4141
- name: Build ${{ matrix.runtime }} runtime
4242
id: srtool_build
43-
uses: chevdor/srtool-actions@v0.3.0
43+
uses: chevdor/srtool-actions@v0.4.0
4444
with:
45-
# This is the default with chevdor/[email protected] but we make it clear
45+
# This is the default with chevdor/[email protected]+ but we make it clear
4646
image: paritytech/srtool
4747
chain: ${{ matrix.runtime }}
4848

@@ -71,7 +71,7 @@ jobs:
7171
asset_upload_url: ${{ steps.create-release.outputs.upload_url }}
7272
steps:
7373
- name: Checkout sources
74-
uses: actions/checkout@v2
74+
uses: actions/checkout@v3
7575
with:
7676
fetch-depth: 0
7777
path: polkadot
@@ -150,10 +150,10 @@ jobs:
150150
runtime: ["polkadot", "kusama", "westend", "rococo"]
151151
steps:
152152
- name: Checkout sources
153-
uses: actions/checkout@v2
153+
uses: actions/checkout@v3
154154
- name: Download artifacts
155155
uses: actions/download-artifact@v2
156-
- name: Set up Ruby 2.7
156+
- name: Set up Ruby
157157
uses: ruby/setup-ruby@v1
158158
with:
159159
ruby-version: 3.0.0

‎.github/workflows/release-candidate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout sources
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v3
1212
with:
1313
fetch-depth: 0
1414
- id: compute_tag

‎.gitlab-ci.yml

Lines changed: 6 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ variables:
3333
DOCKER_OS: "debian:stretch"
3434
ARCH: "x86_64"
3535
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.25"
36-
VAULT_SERVER_URL: "https://vault.parity-mgmt-vault.parity.io"
37-
VAULT_AUTH_PATH: "gitlab-parity-io-jwt"
38-
VAULT_AUTH_ROLE: "cicd_gitlab_parity_${CI_PROJECT_NAME}"
3936
PIPELINE_SCRIPTS_TAG: "v0.4"
4037

4138
default:
@@ -116,49 +113,6 @@ default:
116113
- if: $CI_PIPELINE_SOURCE == "schedule"
117114
- if: $CI_COMMIT_REF_NAME == "master"
118115

119-
#### Vault secrets
120-
.vault-secrets: &vault-secrets
121-
secrets:
122-
AWS_ACCESS_KEY_ID:
123-
vault: cicd/gitlab/parity/polkadot/AWS_ACCESS_KEY_ID@kv
124-
file: false
125-
AWS_SECRET_ACCESS_KEY:
126-
vault: cicd/gitlab/parity/polkadot/AWS_SECRET_ACCESS_KEY@kv
127-
file: false
128-
GITHUB_PR_TOKEN:
129-
vault: cicd/gitlab/parity/GITHUB_PR_TOKEN@kv
130-
file: false
131-
GITHUB_TOKEN:
132-
vault: cicd/gitlab/parity/GITHUB_TOKEN@kv
133-
file: false
134-
GITHUB_USER:
135-
vault: cicd/gitlab/parity/polkadot/GITHUB_USER@kv
136-
file: false
137-
GITHUB_RELEASE_TOKEN:
138-
vault: cicd/gitlab/parity/polkadot/GITHUB_RELEASE_TOKEN@kv
139-
file: false
140-
GITHUB_SSH_PRIV_KEY:
141-
vault: cicd/gitlab/parity/polkadot/GITHUB_SSH_PRIV_KEY@kv
142-
file: false
143-
MATRIX_ACCESS_TOKEN:
144-
vault: cicd/gitlab/parity/polkadot/MATRIX_ACCESS_TOKEN@kv
145-
file: false
146-
MATRIX_ROOM_ID:
147-
vault: cicd/gitlab/parity/polkadot/MATRIX_ROOM_ID@kv
148-
file: false
149-
PARITYPR_USER:
150-
vault: cicd/gitlab/parity/polkadot/PARITYPR_USER@kv
151-
file: false
152-
PARITYPR_PASS:
153-
vault: cicd/gitlab/parity/polkadot/PARITYPR_PASS@kv
154-
file: false
155-
PIPELINE_TOKEN:
156-
vault: cicd/gitlab/parity/polkadot/PIPELINE_TOKEN@kv
157-
file: false
158-
REL_MAN_ROOM_ID:
159-
vault: cicd/gitlab/parity/polkadot/REL_MAN_ROOM_ID@kv
160-
file: false
161-
162116
.build-push-image: &build-push-image
163117
<<: *kubernetes-env
164118
image: quay.io/buildah/stable
@@ -240,9 +194,7 @@ build-linux-stable:
240194
- sha256sum polkadot | tee polkadot.sha256
241195
- shasum -c polkadot.sha256
242196
- popd
243-
- EXTRATAG="$(./artifacts/polkadot --version |
244-
sed -n -r 's/^polkadot ([0-9.]+.*-[0-9a-f]{7,13})-.*$/\1/p')"
245-
- EXTRATAG="${CI_COMMIT_REF_NAME}-${EXTRATAG}-$(cut -c 1-8 ./artifacts/polkadot.sha256)"
197+
- EXTRATAG="${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
246198
- echo "Polkadot version = ${VERSION} (EXTRATAG = ${EXTRATAG})"
247199
- echo -n ${VERSION} > ./artifacts/VERSION
248200
- echo -n ${EXTRATAG} > ./artifacts/EXTRATAG
@@ -340,6 +292,9 @@ check-dependent-cumulus:
340292
variables:
341293
DEPENDENT_REPO: cumulus
342294
EXTRA_DEPENDENCIES: substrate
295+
COMPANION_OVERRIDES: |
296+
polkadot: release-v*
297+
cumulus: polkadot-v*
343298
344299
test-node-metrics:
345300
stage: stage2
@@ -475,7 +430,6 @@ publish-s3-release: &publish-s3
475430
- job: build-linux-stable
476431
artifacts: true
477432
<<: *kubernetes-env
478-
<<: *vault-secrets
479433
image: paritytech/awscli:latest
480434
variables:
481435
GIT_STRATEGY: none
@@ -560,7 +514,8 @@ build-rustdoc:
560514
- ./crate-docs/
561515
script:
562516
# FIXME: it fails with `RUSTDOCFLAGS="-Dwarnings"` and `--all-features`
563-
- time cargo doc --workspace --verbose
517+
# FIXME: return to stable when https://github.com/rust-lang/rust/issues/96937 gets into stable
518+
- time cargo +nightly doc --workspace --verbose
564519
- rm -f ./target/doc/.lock
565520
- mv ./target/doc ./crate-docs
566521
# FIXME: remove me after CI image gets nonroot
@@ -762,7 +717,6 @@ zombienet-tests-malus-dispute-valid:
762717
publish-rustdoc:
763718
stage: stage4
764719
<<: *kubernetes-env
765-
<<: *vault-secrets
766720
image: paritytech/tools:latest
767721
variables:
768722
GIT_DEPTH: 100

0 commit comments

Comments
 (0)