Merge branch 'master' into beefy-small-fixes

.github/scripts/check-workspace.py

@@ -27,6 +27,7 @@ def main(root, exclude):
 	all_crates = get_crates(root, exclude)
 	print(f'📦 Found {len(all_crates)} crates in total')
 
+	check_duplicates(workspace_crates)
 	check_missing(workspace_crates, all_crates)
 	check_links(all_crates)
 
@@ -89,6 +90,16 @@ def get_crates(workspace_dir, exclude_crates) -> dict:
 
 	return crates
 
+# Check that there are no duplicate entries in the workspace.
+def check_duplicates(workspace_crates):
+	print(f'🔎 Checking for duplicate crates')
+	found = {}
+	for path in workspace_crates:
+		if path in found:
+			print(f'❌ crate is listed twice in the workspace {path}')
+			sys.exit(1)
+		found[path] = True
+
 # Check that all crates are in the workspace.
 def check_missing(workspace_crates, all_crates):
 	print(f'🔎 Checking for missing crates')

.gitlab-ci.yml

@@ -133,7 +133,6 @@ default:
       fi
     - ls -al
     - rm -f forklift.sock
-    - forklift clean
     #
     - echo "FL_FORKLIFT_VERSION ${FL_FORKLIFT_VERSION}"
     - echo "FORKLIFT_PACKAGE_SUFFIX $FORKLIFT_PACKAGE_SUFFIX"

.gitlab/pipeline/build.yml

@@ -382,21 +382,3 @@ build-subkey-linux:
 #   after_script: [""]
 #   tags:
 #     - osx
-
-# bridges
-
-# we need some non-binary artifacts in our bridges+zombienet image
-prepare-bridges-zombienet-artifacts:
-  stage: build
-  extends:
-    - .docker-env
-    - .common-refs
-    - .run-immediately
-    - .collect-artifacts
-  before_script:
-    - mkdir -p ./artifacts/bridges-polkadot-sdk/bridges
-    - mkdir -p ./artifacts/bridges-polkadot-sdk/cumulus/zombienet
-  script:
-    - cp -r bridges/zombienet ./artifacts/bridges-polkadot-sdk/bridges/zombienet
-    - cp -r cumulus/scripts ./artifacts/bridges-polkadot-sdk/cumulus/scripts
-    - cp -r cumulus/zombienet/bridge-hubs ./artifacts/bridges-polkadot-sdk/cumulus/zombienet/bridge-hubs

.gitlab/pipeline/publish.yml

@@ -66,8 +66,6 @@ publish-rustdoc:
 # note: images are used not only in zombienet but also in rococo, wococo and versi
 .build-push-image:
   image: $BUILDAH_IMAGE
-  extends:
-    - .zombienet-refs
   variables:
     DOCKERFILE: "" # docker/path-to.Dockerfile
     IMAGE_NAME: "" # docker.io/paritypr/image_name
@@ -79,7 +77,6 @@ publish-rustdoc:
       --build-arg VCS_REF="${CI_COMMIT_SHA}"
       --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
       --build-arg IMAGE_NAME="${IMAGE_NAME}"
-      --build-arg ZOMBIENET_IMAGE="${ZOMBIENET_IMAGE}"
       --tag "$IMAGE_NAME:${DOCKER_IMAGES_VERSION}"
       --file ${DOCKERFILE} .
     - echo "$PARITYPR_PASS" |
@@ -166,22 +163,3 @@ build-push-image-substrate-pr:
   variables:
     DOCKERFILE: "docker/dockerfiles/substrate_injected.Dockerfile"
     IMAGE_NAME: "docker.io/paritypr/substrate"
-
-# unlike other images, bridges+zombienet image is based on Zombienet image that pulls required binaries
-# from other fresh images (polkadot and cumulus)
-build-push-image-bridges-zombienet-tests:
-  stage: publish
-  extends:
-    - .kubernetes-env
-    - .common-refs
-    - .build-push-image
-  needs:
-    - job: build-linux-stable
-      artifacts: true
-    - job: build-linux-stable-cumulus
-      artifacts: true
-    - job: prepare-bridges-zombienet-artifacts
-      artifacts: true
-  variables:
-    DOCKERFILE: "docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile"
-    IMAGE_NAME: "docker.io/paritypr/bridges-zombienet-tests"

.gitlab/pipeline/zombienet.yml

@@ -10,5 +10,3 @@ include:
   - .gitlab/pipeline/zombienet/cumulus.yml
   # polkadot tests
   - .gitlab/pipeline/zombienet/polkadot.yml
-  # bridges tests
-  - .gitlab/pipeline/zombienet/bridges.yml