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

Commit 36268ec

Browse files
slumberslumber
committed
Merge remote-tracking branch 'origin/master' into rh-async-backing-feature
2 parents c1fbdee + 5a619f0 commit 36268ec

File tree

422 files changed

+8657
-6971
lines changed

Some content is hidden

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

422 files changed

+8657
-6971
lines changed

‎.github/workflows/honggfuzz.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454

5555
- name: Cache Seed
5656
id: cache-seed-round-trip
57-
uses: actions/cache@v2
57+
uses: actions/cache@v3
5858
with:
5959
path: erasure-coding/fuzzer/hfuzz_workspace
6060
key: ${{ runner.os }}-erasure-coding
@@ -100,7 +100,7 @@ jobs:
100100

101101
- name: Cache Seed
102102
id: cache-seed-reconstruct
103-
uses: actions/cache@v2
103+
uses: actions/cache@v3
104104
with:
105105
path: erasure-coding/fuzzer/hfuzz_workspace
106106
key: ${{ runner.os }}-erasure-coding

‎.github/workflows/pr-custom-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ jobs:
3737
if: github.event.pull_request.draft == true
3838
run: exit 1
3939
- name: pr-custom-review
40-
uses: paritytech/pr-custom-review@v2
40+
uses: paritytech/pr-custom-review@action-v3
4141
with:
42-
token: ${{ secrets.PRCR_TOKEN }}
42+
checks-reviews-api: http://pcr.parity-prod.parity.io/api/v1/check_reviews

‎.github/workflows/release-01_branch-check.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Release - Branch check
2+
on:
3+
push:
4+
branches:
5+
- release-v[0-9]+.[0-9]+.[0-9]+
6+
7+
workflow_dispatch:
8+
9+
jobs:
10+
tag_rc:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout sources
14+
uses: actions/checkout@v3
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Run check
19+
shell: bash
20+
run: ./scripts/ci/github/check-rel-br

‎.github/workflows/release-candidate.yml renamed to ‎.github/workflows/release-10_candidate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Release-candidate automation
1+
name: Release - RC automation
22
on:
33
push:
44
branches:

‎.github/workflows/extrinsic-ordering-check-from-bin.yml renamed to ‎.github/workflows/release-20_extrinsic-ordering-check-from-bin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This workflow performs the Extrinsic Ordering Check on demand using a binary
22

3-
name: Extrinsic Ordering Check from Binary
3+
name: Release - Extrinsic Ordering Check
44
on:
55
workflow_dispatch:
66
inputs:
@@ -74,7 +74,7 @@ jobs:
7474
run: pkill polkadot
7575

7676
- name: Save output as artifact
77-
uses: actions/upload-artifact@v2
77+
uses: actions/upload-artifact@v3
7878
with:
7979
name: ${{ env.CHAIN }}
8080
path: |

‎.github/workflows/publish-draft-release.yml renamed to ‎.github/workflows/release-30_publish-draft-release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish draft release
1+
name: Release - Publish draft
22

33
on:
44
push:
@@ -30,7 +30,7 @@ jobs:
3030
uses: actions/checkout@v3
3131

3232
- name: Cache target dir
33-
uses: actions/cache@v2
33+
uses: actions/cache@v3
3434
with:
3535
path: "${{ github.workspace }}/runtime/${{ matrix.runtime }}/target"
3636
key: srtool-target-${{ matrix.runtime }}-${{ github.sha }}
@@ -51,13 +51,13 @@ jobs:
5151
echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.runtime }}_srtool_output.json
5252
5353
- name: Upload ${{ matrix.runtime }} srtool json
54-
uses: actions/upload-artifact@v2
54+
uses: actions/upload-artifact@v3
5555
with:
5656
name: ${{ matrix.runtime }}-srtool-json
5757
path: ${{ matrix.runtime }}_srtool_output.json
5858

5959
- name: Upload ${{ matrix.runtime }} runtime
60-
uses: actions/upload-artifact@v2
60+
uses: actions/upload-artifact@v3
6161
with:
6262
name: ${{ matrix.runtime }}-runtime
6363
path: |
@@ -82,7 +82,7 @@ jobs:
8282
ruby-version: 3.0.0
8383

8484
- name: Download srtool json output
85-
uses: actions/download-artifact@v2
85+
uses: actions/download-artifact@v3
8686

8787
- name: Prepare tooling
8888
run: |
@@ -122,7 +122,7 @@ jobs:
122122
ls -al context.json
123123
124124
- name: Archive artifact context.json
125-
uses: actions/upload-artifact@v2
125+
uses: actions/upload-artifact@v3
126126
with:
127127
name: release-notes-context
128128
path: |
@@ -152,7 +152,7 @@ jobs:
152152
- name: Checkout sources
153153
uses: actions/checkout@v3
154154
- name: Download artifacts
155-
uses: actions/download-artifact@v2
155+
uses: actions/download-artifact@v3
156156
- name: Set up Ruby
157157
uses: ruby/setup-ruby@v1
158158
with:

‎.github/workflows/publish-docker-release.yml renamed to ‎.github/workflows/release-50_publish-docker-release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish Docker image for new releases
1+
name: Release - Publish Docker image for new releases
22

33
on:
44
release:
@@ -12,22 +12,22 @@ jobs:
1212
- name: Checkout sources
1313
uses: actions/checkout@v3
1414
- name: Set up Docker Buildx
15-
uses: docker/setup-buildx-action@v1
15+
uses: docker/setup-buildx-action@f211e3e9ded2d9377c8cadc4489a4e38014bc4c9 # v1.7
1616
- name: Cache Docker layers
17-
uses: actions/cache@v2
17+
uses: actions/cache@v3
1818
with:
1919
path: /tmp/.buildx-cache
2020
key: ${{ runner.os }}-buildx-${{ github.sha }}
2121
restore-keys: |
2222
${{ runner.os }}-buildx-
2323
- name: Login to Dockerhub
24-
uses: docker/login-action@v1
24+
uses: docker/login-action@v2
2525
with:
2626
username: ${{ secrets.DOCKERHUB_USERNAME }}
2727
password: ${{ secrets.DOCKERHUB_TOKEN }}
2828
- name: Build and push
2929
id: docker_build
30-
uses: docker/build-push-action@v2
30+
uses: docker/build-push-action@v3
3131
with:
3232
push: true
3333
file: scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile

‎.github/workflows/publish-docker-manual.yml renamed to ‎.github/workflows/release-51_publish-docker-manual.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish Docker image (manual dispatch)
1+
name: Release - Publish Docker image (manual dispatch)
22

33
on:
44
workflow_dispatch:
@@ -19,22 +19,22 @@ jobs:
1919
- name: Checkout sources
2020
uses: actions/checkout@v3
2121
- name: Set up Docker Buildx
22-
uses: docker/setup-buildx-action@v1
22+
uses: docker/setup-buildx-action@f211e3e9ded2d9377c8cadc4489a4e38014bc4c9 # v1.7
2323
- name: Cache Docker layers
24-
uses: actions/cache@v2
24+
uses: actions/cache@v3
2525
with:
2626
path: /tmp/.buildx-cache
2727
key: ${{ runner.os }}-buildx-${{ github.sha }}
2828
restore-keys: |
2929
${{ runner.os }}-buildx-
3030
- name: Login to Dockerhub
31-
uses: docker/login-action@v1
31+
uses: docker/login-action@v2
3232
with:
3333
username: ${{ secrets.DOCKERHUB_USERNAME }}
3434
password: ${{ secrets.DOCKERHUB_TOKEN }}
3535
- name: Build and push
3636
id: docker_build
37-
uses: docker/build-push-action@v2
37+
uses: docker/build-push-action@v3
3838
with:
3939
push: true
4040
file: scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile

‎.github/workflows/release-bot.yml renamed to ‎.github/workflows/release-99_bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Send new release notification to matrix channels
1+
name: Release - Send new release notification to matrix channels
22
on:
33
release:
44
types:

‎.gitlab-ci.yml

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,22 @@ default:
106106
- if: $CI_COMMIT_REF_NAME == "master"
107107
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
108108

109+
.deploy-testnet-refs: &deploy-testnet-refs
110+
rules:
111+
- if: $CI_PIPELINE_SOURCE == "pipeline"
112+
when: never
113+
- if: $CI_PIPELINE_SOURCE == "schedule"
114+
- if: $CI_COMMIT_REF_NAME == "master"
115+
109116
.publish-refs: &publish-refs
110117
rules:
111118
- if: $CI_PIPELINE_SOURCE == "pipeline"
112119
when: never
113120
- if: $CI_PIPELINE_SOURCE == "schedule"
121+
- if: $CI_PIPELINE_SOURCE == "web" &&
122+
$CI_COMMIT_REF_NAME == "master"
114123
- if: $CI_COMMIT_REF_NAME == "master"
124+
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
115125

116126
.build-push-image: &build-push-image
117127
<<: *kubernetes-env
@@ -266,6 +276,22 @@ build-malus:
266276
- echo "polkadot-test-malus = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
267277
- cp -r ./scripts/* ./artifacts
268278

279+
build-staking-miner:
280+
stage: stage1
281+
<<: *collect-artifacts
282+
<<: *docker-env
283+
<<: *compiler-info
284+
<<: *common-refs
285+
script:
286+
- time cargo build --locked --release --package staking-miner
287+
# pack artifacts
288+
- mkdir -p ./artifacts
289+
- mv ./target/release/staking-miner ./artifacts/.
290+
- echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
291+
- echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
292+
- echo "staking-miner = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
293+
- cp -r ./scripts/* ./artifacts
294+
269295
#### stage: stage2
270296

271297
.check-dependent-project: &check-dependent-project
@@ -424,6 +450,23 @@ publish-malus-image:
424450
# this artifact is used in zombienet-tests job
425451
dotenv: ./artifacts/malus.env
426452

453+
publish-staking-miner-image:
454+
stage: stage2
455+
<<: *build-push-image
456+
<<: *publish-refs
457+
variables:
458+
<<: *image-variables
459+
# scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
460+
DOCKERFILE: ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
461+
IMAGE_NAME: docker.io/paritytech/staking-miner
462+
GIT_STRATEGY: none
463+
DOCKER_USER: ${Docker_Hub_User_Parity}
464+
DOCKER_PASS: ${Docker_Hub_Pass_Parity}
465+
needs:
466+
- job: build-staking-miner
467+
artifacts: true
468+
469+
427470
publish-s3-release: &publish-s3
428471
stage: stage3
429472
needs:
@@ -586,7 +629,7 @@ deploy-parity-testnet:
586629
needs:
587630
- job: test-deterministic-wasm
588631
artifacts: false
589-
<<: *publish-refs
632+
<<: *deploy-testnet-refs
590633
variables:
591634
POLKADOT_CI_COMMIT_NAME: "${CI_COMMIT_REF_NAME}"
592635
POLKADOT_CI_COMMIT_REF: "${CI_COMMIT_SHORT_SHA}"
@@ -682,6 +725,35 @@ zombienet-tests-parachains-disputes:
682725
tags:
683726
- zombienet-polkadot-integration-test
684727

728+
zombienet-test-parachains-upgrade-smoke-test:
729+
stage: stage3
730+
image: "${ZOMBIENET_IMAGE}"
731+
<<: *kubernetes-env
732+
<<: *zombienet-refs
733+
needs:
734+
- job: publish-polkadot-debug-image
735+
- job: publish-malus-image
736+
- job: publish-test-collators-image
737+
variables:
738+
GH_DIR: 'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke'
739+
before_script:
740+
- echo "ZombieNet Tests Config"
741+
- echo "docker.io/parity/polkadot:latest"
742+
- echo "docker.io/parity/polkadot-collator:latest"
743+
- echo "${ZOMBIENET_IMAGE}"
744+
- echo "${GH_DIR}"
745+
- export DEBUG=zombie,zombie::network-node
746+
- export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest" # Use polkadot latest image
747+
- export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
748+
script:
749+
- /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
750+
--github-remote-dir="${GH_DIR}"
751+
--test="0002-parachains-upgrade-smoke-test.feature"
752+
allow_failure: true
753+
retry: 2
754+
tags:
755+
- zombienet-polkadot-integration-test
756+
685757
zombienet-tests-malus-dispute-valid:
686758
stage: stage3
687759
image: "${ZOMBIENET_IMAGE}"

0 commit comments

Comments
 (0)