Merge branch 'master' into cleanup-legacy-executor

.github/workflows/release-50_publish-docker.yml

@@ -47,7 +47,6 @@ on:
         type: choice
         options:
           - polkadot
-          - staking-miner
           - polkadot-parachain
 
 permissions:
@@ -158,18 +157,6 @@ jobs:
           echo "tag=latest" >> $GITHUB_OUTPUT
           echo "release=${release}" >> $GITHUB_OUTPUT
 
-      - name: Build Injected Container image for polkadot/staking-miner
-        if: ${{ env.BINARY == 'polkadot' || env.BINARY == 'staking-miner' }}
-        env:
-          ARTIFACTS_FOLDER: ./release-artifacts
-          IMAGE_NAME: ${{ env.BINARY }}
-          OWNER: ${{ env.DOCKER_OWNER }}
-          TAGS: ${{ join(steps.fetch_rc_refs.outputs.*, ',') || join(steps.fetch_release_refs.outputs.*, ',') }}
-        run: |
-          ls -al
-          echo "Building container for $BINARY"
-          ./docker/scripts/build-injected.sh
-
       - name: Build Injected Container image for polkadot-parachain
         if: ${{ env.BINARY == 'polkadot-parachain' }}
         env:

.gitlab-ci.yml

@@ -114,7 +114,7 @@ default:
     - !reference [.rust-info-script, script]
     - !reference [.rusty-cachier, before_script]
   tags:
-    - linux-docker-vm-c2
+    - linux-docker
 
 # rusty-cachier's hidden job. Parts of this job are used to instrument the pipeline's other real jobs with rusty-cachier
 # rusty-cachier's commands are described here: https://gitlab.parity.io/parity/infrastructure/ci_cd/rusty-cachier/client#description

.gitlab/pipeline/build.yml

@@ -77,26 +77,6 @@ build-malus:
     - echo "polkadot-test-malus = $(cat ./artifacts/VERSION) (EXTRATAG = $(cat ./artifacts/EXTRATAG))"
     - cp -r ./docker/* ./artifacts
 
-build-staking-miner:
-  stage: build
-  extends:
-    - .docker-env
-    - .common-refs
-    # - .collect-artifacts
-  # DAG
-  needs:
-    - job: build-malus
-      artifacts: false
-  script:
-    - time cargo build -q --locked --release --package staging-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
-
 build-rustdoc:
   stage: build
   extends:
@@ -131,6 +111,9 @@ build-rustdoc:
             sed -i "s|</head>|$script_content</head>|" "$file"
         }
         export -f process_file
+        # xargs runs process_file in seperate shells without access to outer variables.
+        # to make script_content available inside process_file, export it as an env var here.
+        export script_content
 
         # Modify .html files in parallel using xargs, otherwise it can take a long time.
         find "$path" -name '*.html' | xargs -I {} -P "$(nproc)" bash -c 'process_file "$@"' _ {}
@@ -163,7 +146,7 @@ build-short-benchmark:
     - .run-immediately
     - .collect-artifacts
   script:
-    - cargo build --profile release --locked --features=runtime-benchmarks --bin polkadot --workspace
+    - cargo build --profile release --locked --features=runtime-benchmarks,on-chain-release-build --bin polkadot --workspace
     - mkdir -p artifacts
     - target/release/polkadot --version
     - cp ./target/release/polkadot ./artifacts/
@@ -290,7 +273,7 @@ build-short-benchmark-cumulus:
     - .run-immediately
     - .collect-artifacts
   script:
-    - cargo build --profile release --locked --features=runtime-benchmarks -p polkadot-parachain-bin --bin polkadot-parachain
+    - cargo build --profile release --locked --features=runtime-benchmarks,on-chain-release-build -p polkadot-parachain-bin --bin polkadot-parachain --workspace
     - mkdir -p artifacts
     - target/release/polkadot-parachain --version
     - cp ./target/release/polkadot-parachain ./artifacts/
@@ -358,7 +341,7 @@ build-subkey-linux:
   extends: .build-subkey
   # DAG
   needs:
-    - job: build-staking-miner
+    - job: build-malus
       artifacts: false
 # tbd
 # build-subkey-macos:

.gitlab/pipeline/publish.yml

@@ -328,24 +328,6 @@ build-push-image-substrate-pr:
 #       # this artifact is used in zombienet-tests job
 #       dotenv: ./artifacts/malus.env
 
-# publish-staking-miner-image:
-#   stage: publish
-#   extends:
-#     - .kubernetes-env
-#     - .build-push-image
-#     - .publish-refs
-#   variables:
-#     CI_IMAGE: ${BUILDAH_IMAGE}
-#     # 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
-
 # substrate
 
 # publish-substrate-image-pr:

.gitlab/pipeline/short-benchmarks.yml

@@ -18,7 +18,7 @@ short-benchmark-polkadot: &short-bench
   tags:
     - benchmark
   script:
-    - ./artifacts/polkadot benchmark pallet --execution wasm --wasm-execution compiled --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
+    - ./artifacts/polkadot benchmark pallet --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
 short-benchmark-kusama:
   <<: *short-bench
@@ -45,7 +45,7 @@ short-benchmark-westend:
   tags:
     - benchmark
   script:
-    - ./artifacts/polkadot-parachain benchmark pallet --wasm-execution compiled --chain $RUNTIME_CHAIN --pallet "*" --extrinsic "*" --steps 2 --repeat 1
+    - ./artifacts/polkadot-parachain benchmark pallet --chain $RUNTIME_CHAIN --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
 short-benchmark-asset-hub-polkadot:
   <<: *short-bench-cumulus