From 914db49d0429cb1a591f92c78826e109916c838c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 25 Apr 2022 17:07:09 +0200 Subject: [PATCH] cumulus-companion: Fix CI when there is no Polkadot companion (#11280) This tries to fix the CI if there is no polkadot companion. Currently we don't update Polkadot master in Cumulus, which means we may use some old commit that isn't compiling with the latest Substrate master anymore. This can happen if there was a pr that had a companion in Polkadot, but no companion was required for Cumulus. Then Cumulus will still point to some old Polkadot commit that isn't compiling anymore with the latest Substrate commit. So, we need to tell the script to use the latest master of Polkadot. If there is a companion for Polkadot, it would simply override the extra dependency patch later on. --- substrate/.gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/substrate/.gitlab-ci.yml b/substrate/.gitlab-ci.yml index 62684ffebd..1c3e81ca71 100644 --- a/substrate/.gitlab-ci.yml +++ b/substrate/.gitlab-ci.yml @@ -474,6 +474,7 @@ cargo-check-macos: "$DEPENDENT_REPO" "$GITHUB_PR_TOKEN" "$CARGO_UPDATE_CRATES" + "$EXTRA_DEPENDENCIES" # Individual jobs are set up for each dependent project so that they can be ran in parallel. # Arguably we could generate a job for each companion in the PR's description using Gitlab's @@ -490,6 +491,7 @@ check-dependent-cumulus: variables: DEPENDENT_REPO: cumulus CARGO_UPDATE_CRATES: "sp-io polkadot-runtime-common" + EXTRA_DEPENDENCIES: polkadot build-linux-substrate: