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

Commit 51dd597

Browse files
committed
Merge branch 'master' into bernhardAssure_backed_candidates_are_sor
* master: (23 commits) Fix path of the polkadot_injected docker image (#4463) update docs on `validation_upgrade_frequency` (#4460) Fix path of the polkadot sha256 (#4458) Fix cumulus companion CI job (#4451) Add doc about runtime version bump (#4418) Bump trybuild from 1.0.52 to 1.0.53 (#4455) companion for #10231 (#4306) trivial fix (#4441) Rococo: ability to programatically assign slots to teams (#3943) Add parent header hash to log (#4421) bump tx versions (#4447) Companion for substrate/10347 (#4413) Improve paras runtime `BenchBuilder` api (#4318) Add CI team to `CODEOWNERS` file (#4350) XCM Benchmarks for Generic Instructions (#3940) Announce only on releases (#4417) Companion for 10379 (EnsureOneOf) (#4405) add pallet-babe/std (#4438) update Cargo.lock Squashed 'bridges/' changes from 407bf44a8a..1602249f0a ...
2 parents de53d57 + 4468927 commit 51dd597

File tree

405 files changed

+24001
-37105
lines changed

Some content is hidden

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

405 files changed

+24001
-37105
lines changed

.github/CODEOWNERS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
bridges/ @tomusdrw @svyatonik @adoerr @acatangiu @antonio-dropulic
2-
2+
3+
# CI
4+
/.github/ @paritytech/ci @chevdor
5+
/scripts/github/ @paritytech/ci @chevdor
6+
/scripts/gitlab/ @paritytech/ci @chevdor
7+
/.gitlab-ci.yml @paritytech/ci

.github/ISSUE_TEMPLATE/release.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ candidate branch.
1717

1818
- [ ] Verify [`spec_version`](#spec-version) has been incremented since the
1919
last release for any native runtimes from any existing use on public
20-
(non-private/test) networks.
20+
(non-private/test) networks. If the runtime was published (release or pre-release), either
21+
the `spec_version` or `impl` must be bumped.
2122
- [ ] Verify previously [completed migrations](#old-migrations-removed) are
2223
removed for any public (non-private/test) networks.
2324
- [ ] Verify pallet and [extrinsic ordering](#extrinsic-ordering) has stayed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: docker/build-push-action@v2
3131
with:
3232
push: true
33-
file: scripts/docker/polkadot_injected_release.Dockerfile
33+
file: scripts/dockerfiles/polkadot_injected_release.Dockerfile
3434
tags: |
3535
parity/polkadot:latest
3636
parity/polkadot:${{ github.event.release.tag_name }}

.github/workflows/release-bot.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,35 @@ on:
33
release:
44
types:
55
- published
6+
67
jobs:
78
ping_matrix:
89
strategy:
910
matrix:
1011
channel:
11-
- '!LhjZccBOqFNYKLdmbb:polkadot.builders' # #KusamaValidatorLounge:polkadot.builders
12-
- '!FMwxpQnYhRCNDRsYGI:matrix.parity.io' # #kusama-announcements:matrix.parity.io
13-
- '!NZrbtteFeqYKCUGQtr:matrix.parity.io' # #polkadotvalidatorlounge:web3.foundation
14-
- '!UqHPWiCBGZWxrmYBkF:matrix.parity.io' # #polkadot-announcements:matrix.parity.io
15-
- '!NTogofoetwjbTwOoPi:matrix.parity.io' # Internal release-notes channel
12+
- name: '#KusamaValidatorLounge:polkadot.builders'
13+
room: '!LhjZccBOqFNYKLdmbb:polkadot.builders'
14+
pre-releases: false
15+
- name: '#kusama-announcements:matrix.parity.io'
16+
room: '!FMwxpQnYhRCNDRsYGI:matrix.parity.io'
17+
pre-release: false
18+
- name: '#polkadotvalidatorlounge:web3.foundation'
19+
room: '!NZrbtteFeqYKCUGQtr:matrix.parity.io'
20+
pre-release: false
21+
- name: '#polkadot-announcements:matrix.parity.io'
22+
room: '!UqHPWiCBGZWxrmYBkF:matrix.parity.io'
23+
pre-release: false
24+
- name: Internal release-notes channel
25+
room: '!NTogofoetwjbTwOoPi:matrix.parity.io'
26+
pre-release: true
27+
1628
runs-on: ubuntu-latest
1729
steps:
18-
- name: Send Matrix message
30+
- name: Send Matrix message to ${{ matrix.channel.name }}
31+
if: github.event.release.prerelease == false || matrix.channel.pre-release
1932
uses: s3krit/[email protected]
2033
with:
21-
room_id: ${{ matrix.channel }} # heh
34+
room_id: ${{ matrix.channel.room }}
2235
access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
23-
message: "***Polkadot ${{github.event.release.tag_name}} has been released!***<br/>${{github.event.release.html_url}}<br/><br/>${{github.event.release.body}}<br/>"
2436
server: "matrix.parity.io"
37+
message: "***Polkadot ${{github.event.release.tag_name}} has been released!***<br/>${{github.event.release.html_url}}<br/><br/>${{github.event.release.body}}<br/>"

.gitlab-ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
VAULT_SERVER_URL: "https://vault.parity-mgmt-vault.parity.io"
3232
VAULT_AUTH_PATH: "gitlab-parity-io-jwt"
3333
VAULT_AUTH_ROLE: "cicd_gitlab_parity_${CI_PROJECT_NAME}"
34-
PIPELINE_SCRIPTS_TAG: "v0.1"
34+
PIPELINE_SCRIPTS_TAG: "v0.4"
3535

3636
default:
3737
cache: {}
@@ -201,7 +201,10 @@ test-build-linux-stable:
201201
- mkdir -p ./artifacts
202202
- VERSION="${CI_COMMIT_REF_NAME}" # will be tag or branch name
203203
- mv ./target/release/polkadot ./artifacts/.
204-
- sha256sum ./artifacts/polkadot | tee ./artifacts/polkadot.sha256
204+
- pushd artifacts
205+
- sha256sum polkadot | tee polkadot.sha256
206+
- shasum -c polkadot.sha256
207+
- popd
205208
- EXTRATAG="$(./artifacts/polkadot --version |
206209
sed -n -r 's/^polkadot ([0-9.]+.*-[0-9a-f]{7,13})-.*$/\1/p')"
207210
- EXTRATAG="${CI_COMMIT_REF_NAME}-${EXTRATAG}-$(cut -c 1-8 ./artifacts/polkadot.sha256)"
@@ -300,11 +303,13 @@ build-malus:
300303
--polkadot
301304
"$DEPENDENT_REPO"
302305
"$GITHUB_PR_TOKEN"
306+
$CARGO_UPDATE_CRATES
303307

304308
check-dependent-cumulus:
305309
<<: *check-dependent-project
306310
variables:
307311
DEPENDENT_REPO: cumulus
312+
CARGO_UPDATE_CRATES: "sp-io polkadot-runtime-common"
308313

309314
check-transaction-versions:
310315
stage: build

0 commit comments

Comments
 (0)