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

Commit

Permalink
Merge remote-tracking branch 'origin/master' into rh-async-backing-fe…
Browse files Browse the repository at this point in the history
…ature
  • Loading branch information
slumber committed Jun 22, 2022
2 parents c1fbdee + 5a619f0 commit 36268ec
Show file tree
Hide file tree
Showing 422 changed files with 8,657 additions and 6,971 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/honggfuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

- name: Cache Seed
id: cache-seed-round-trip
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: erasure-coding/fuzzer/hfuzz_workspace
key: ${{ runner.os }}-erasure-coding
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:

- name: Cache Seed
id: cache-seed-reconstruct
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: erasure-coding/fuzzer/hfuzz_workspace
key: ${{ runner.os }}-erasure-coding
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-custom-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ jobs:
if: github.event.pull_request.draft == true
run: exit 1
- name: pr-custom-review
uses: paritytech/pr-custom-review@v2
uses: paritytech/pr-custom-review@action-v3
with:
token: ${{ secrets.PRCR_TOKEN }}
checks-reviews-api: http://pcr.parity-prod.parity.io/api/v1/check_reviews
20 changes: 20 additions & 0 deletions .github/workflows/release-01_branch-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Release - Branch check
on:
push:
branches:
- release-v[0-9]+.[0-9]+.[0-9]+

workflow_dispatch:

jobs:
tag_rc:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Run check
shell: bash
run: ./scripts/ci/github/check-rel-br
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release-candidate automation
name: Release - RC automation
on:
push:
branches:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This workflow performs the Extrinsic Ordering Check on demand using a binary

name: Extrinsic Ordering Check from Binary
name: Release - Extrinsic Ordering Check
on:
workflow_dispatch:
inputs:
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
run: pkill polkadot

- name: Save output as artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ env.CHAIN }}
path: |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish draft release
name: Release - Publish draft

on:
push:
Expand Down Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v3

- name: Cache target dir
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: "${{ github.workspace }}/runtime/${{ matrix.runtime }}/target"
key: srtool-target-${{ matrix.runtime }}-${{ github.sha }}
Expand All @@ -51,13 +51,13 @@ jobs:
echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.runtime }}_srtool_output.json
- name: Upload ${{ matrix.runtime }} srtool json
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.runtime }}-srtool-json
path: ${{ matrix.runtime }}_srtool_output.json

- name: Upload ${{ matrix.runtime }} runtime
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.runtime }}-runtime
path: |
Expand All @@ -82,7 +82,7 @@ jobs:
ruby-version: 3.0.0

- name: Download srtool json output
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3

- name: Prepare tooling
run: |
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
ls -al context.json
- name: Archive artifact context.json
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: release-notes-context
path: |
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v3
- name: Download artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish Docker image for new releases
name: Release - Publish Docker image for new releases

on:
release:
Expand All @@ -12,22 +12,22 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@f211e3e9ded2d9377c8cadc4489a4e38014bc4c9 # v1.7
- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to Dockerhub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
push: true
file: scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish Docker image (manual dispatch)
name: Release - Publish Docker image (manual dispatch)

on:
workflow_dispatch:
Expand All @@ -19,22 +19,22 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@f211e3e9ded2d9377c8cadc4489a4e38014bc4c9 # v1.7
- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to Dockerhub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
push: true
file: scripts/ci/dockerfiles/polkadot_injected_release.Dockerfile
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Send new release notification to matrix channels
name: Release - Send new release notification to matrix channels
on:
release:
types:
Expand Down
74 changes: 73 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,22 @@ default:
- if: $CI_COMMIT_REF_NAME == "master"
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs

.deploy-testnet-refs: &deploy-testnet-refs
rules:
- if: $CI_PIPELINE_SOURCE == "pipeline"
when: never
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_COMMIT_REF_NAME == "master"

.publish-refs: &publish-refs
rules:
- if: $CI_PIPELINE_SOURCE == "pipeline"
when: never
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_PIPELINE_SOURCE == "web" &&
$CI_COMMIT_REF_NAME == "master"
- if: $CI_COMMIT_REF_NAME == "master"
- if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1

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

build-staking-miner:
stage: stage1
<<: *collect-artifacts
<<: *docker-env
<<: *compiler-info
<<: *common-refs
script:
- time cargo build --locked --release --package staking-miner
# pack artifacts
- mkdir -p ./artifacts
- mv ./target/release/staking-miner ./artifacts/.
- echo -n "${CI_COMMIT_REF_NAME}" > ./artifacts/VERSION
- echo -n "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" > ./artifacts/EXTRATAG
- echo "staking-miner = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
- cp -r ./scripts/* ./artifacts

#### stage: stage2

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

publish-staking-miner-image:
stage: stage2
<<: *build-push-image
<<: *publish-refs
variables:
<<: *image-variables
# scripts/ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
DOCKERFILE: ci/dockerfiles/staking-miner/staking-miner_injected.Dockerfile
IMAGE_NAME: docker.io/paritytech/staking-miner
GIT_STRATEGY: none
DOCKER_USER: ${Docker_Hub_User_Parity}
DOCKER_PASS: ${Docker_Hub_Pass_Parity}
needs:
- job: build-staking-miner
artifacts: true


publish-s3-release: &publish-s3
stage: stage3
needs:
Expand Down Expand Up @@ -586,7 +629,7 @@ deploy-parity-testnet:
needs:
- job: test-deterministic-wasm
artifacts: false
<<: *publish-refs
<<: *deploy-testnet-refs
variables:
POLKADOT_CI_COMMIT_NAME: "${CI_COMMIT_REF_NAME}"
POLKADOT_CI_COMMIT_REF: "${CI_COMMIT_SHORT_SHA}"
Expand Down Expand Up @@ -682,6 +725,35 @@ zombienet-tests-parachains-disputes:
tags:
- zombienet-polkadot-integration-test

zombienet-test-parachains-upgrade-smoke-test:
stage: stage3
image: "${ZOMBIENET_IMAGE}"
<<: *kubernetes-env
<<: *zombienet-refs
needs:
- job: publish-polkadot-debug-image
- job: publish-malus-image
- job: publish-test-collators-image
variables:
GH_DIR: 'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke'
before_script:
- echo "ZombieNet Tests Config"
- echo "docker.io/parity/polkadot:latest"
- echo "docker.io/parity/polkadot-collator:latest"
- echo "${ZOMBIENET_IMAGE}"
- echo "${GH_DIR}"
- export DEBUG=zombie,zombie::network-node
- export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest" # Use polkadot latest image
- export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
--github-remote-dir="${GH_DIR}"
--test="0002-parachains-upgrade-smoke-test.feature"
allow_failure: true
retry: 2
tags:
- zombienet-polkadot-integration-test

zombienet-tests-malus-dispute-valid:
stage: stage3
image: "${ZOMBIENET_IMAGE}"
Expand Down
Loading

0 comments on commit 36268ec

Please sign in to comment.