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

bot merge: companion was updated to old dependency commit #400

Open
ordian opened this issue Oct 3, 2022 · 0 comments
Open

bot merge: companion was updated to old dependency commit #400

ordian opened this issue Oct 3, 2022 · 0 comments
Assignees

Comments

@ordian
Copy link
Member

ordian commented Oct 3, 2022

It looks like there's a race condition between updating the companion's lock file and merging substrate PR to master.
Example: paritytech/polkadot#6035
The bot commited 2cadb32 with substrate updated to 37664fe5b3513eb996225f016eceaf74963b8133, which is not what the substrate companion merged to master (it's its parent).

I'd suggest figuring out the exact commit hash of the substrate PR to master and then using cargo update -p sp-io --precise <commit_sha>. This will also help when two PRs are merged without companions.

UPD:

2022-10-03 14:00:58	message="https://github.com/paritytech/substrate/pull/12124 merged successfully."
2022-10-03 14:00:58	message="Cleaning up Merge ...
2022-10-03 14:00:58	message="Acquiring cleanup_merge_request's recursion prevention lock"
2022-10-03 14:00:58	message="Releasing cleanup_merge_request's recursion prevention lock"
2022-10-03 14:00:58	message="Related dependents of paritytech/substrate/pull/12124 (key fd50ee70b705038bf98ec7a182c321b55b4112f0): {}"
2022-10-03 14:00:58	message="Cleaning up cleanup_merge_request recursion prevention lock's entries"
2022-10-03 14:00:58	message="Handling dependents of https://github.com/paritytech/substrate/pull/12124"
2022-10-03 14:00:59	message="response '200 OK' for https://api.github.com/repos/paritytech/polkadot/pulls/6035"
2022-10-03 14:00:59	message="Dependents of https://github.com/paritytech/substrate/pull/12124: [Merge ...
2022-10-03 14:00:59	message="Found current dependents of https://github.com/paritytech/substrate/pull/12124: [Merge ...
2022-10-03 14:00:59	message="response '200 OK' for https://api.github.com/repos/paritytech/polkadot/pulls/6035"
2022-10-03 14:00:59	message="https://github.com/paritytech/polkadot/pull/6035 is mergeable"
2022-10-03 14:00:59	message="Updating https://github.com/paritytech/polkadot/pull/6035 including the following dependencies: {"substrate"}"
2022-10-03 14:00:59	message="polkadot is already cloned; skipping"
2022-10-03 14:00:59 message="Run git ["add", "."] in "/storage/repositories/polkadot""
2022-10-03 14:00:59 message="Run git ["reset", "--hard"] in "/storage/repositories/polkadot""
2022-10-03 14:00:59 message="Run git ["remote", "get-url", "acatangiu"] in "/storage/repositories/polkadot""
2022-10-03 14:00:59 message="Run git ["remote", "remove", "acatangiu"] in "/storage/repositories/polkadot""
2022-10-03 14:00:59 message="auth_token"
2022-10-03 14:00:59 message="Run git ["remote", "add", "acatangiu", "https://x-access-token:$SECRET@github.com/acatangiu/polkadot.git"] in "/storage/repositories/polkadot""
2022-10-03 14:00:59 message="Run git ["fetch", "acatangiu", "beefy-request-response-proto"] in "/storage/repositories/polkadot""
2022-10-03 14:01:00 message="Run git ["rev-parse", "HEAD"] in "/storage/repositories/polkadot""
2022-10-03 14:01:00 message="Run git ["checkout", "da2a4b48ae3433606568b8d649da9c7dfc640b52"] in "/storage/repositories/polkadot""
2022-10-03 14:01:00 message="Run git ["branch", "-D", "beefy-request-response-proto"] in "/storage/repositories/polkadot""
2022-10-03 14:01:00 message="Run git ["checkout", "--track", "acatangiu/beefy-request-response-proto"] in "/storage/repositories/polkadot""
2022-10-03 14:01:00 message="auth_token"
2022-10-03 14:01:00 message="Run git ["remote", "set-url", "origin", "https://x-access-token:$SECRET@github.com/paritytech/polkadot.git"] in "/storage/repositories/polkadot""
2022-10-03 14:01:00 message="Run git ["fetch", "origin", "master"] in "/storage/repositories/polkadot""
2022-10-03 14:01:00 message="Run git ["merge", "origin/master", "--no-ff", "--no-edit"] in "/storage/repositories/polkadot""
2022-10-03 14:01:00 message="Dependencies to update for paritytech/polkadot/pull/6035: {"substrate"}"
2022-10-03 14:01:00 message="Updating references of https://github.com/paritytech/substrate in the Cargo.lock of "/storage/repositories/polkadot""
2022-10-03 14:01:01 message="Run cargo ["update", "-v", "-p", "beefy-gadget-rpc:4.0.0-dev", "-p", "sp-authority-discovery:4.0.0-dev", "-p", "pallet-child-bounties:4.0.0-dev", "-p", "frame-election-provider-support:4.0.0-dev", "-p", "frame-support-test-pallet:4.0.0-dev", "-p", "pallet-authority-discovery:4.0.0-dev", "-p", "substrate-test-utils:4.0.0-dev", "-p", "pallet-session-benchmarking:4.0.0-dev", "-p", "pallet-society:4.0.0-dev", "-p", "sp-externalities:0.12.0", "-p", "sp-api:4.0.0-dev", "-p", "sc-sysinfo:6.0.0-dev", "-p", "pallet-babe:4.0.0-dev", "-p", "sc-transaction-pool:4.0.0-dev", "-p", "substrate-wasm-builder:5.0.0-dev", "-p", "pallet-bags-list-remote-tests:4.0.0-dev", "-p", "sc-tracing-proc-macro:4.0.0-dev", "-p", "pallet-transaction-payment-rpc-runtime-api:4.0.0-dev", "-p", "frame-try-runtime:0.10.0-dev", "-p", "pallet-election-provider-multi-phase:4.0.0-dev", "-p", "sp-mmr-primitives:4.0.0-dev", "-p", "frame-election-provider-solution-type:4.0.0-dev", "-p", "sp-version:5.0.0", "-p", "sp-runtime-interface:6.0.0", "-p", "substrate-test-client:2.0.1", "-p", "sp-timestamp:4.0.0-dev", "-p", "pallet-staking:4.0.0-dev", "-p", "substrate-build-script-utils:3.0.0", "-p", "substrate-test-utils-derive:0.10.0-dev", "-p", "pallet-im-online:4.0.0-dev", "-p", "sp-version-proc-macro:4.0.0-dev", "-p", "sp-api-proc-macro:4.0.0-dev", "-p", "sc-network-light:0.10.0-dev", "-p", "pallet-scheduler:4.0.0-dev", "-p", "sc-sync-state-rpc:0.10.0-dev", "-p", "frame-support-procedural:4.0.0-dev", "-p", "fork-tree:3.0.0", "-p", "sc-executor-common:0.10.0-dev", "-p", "pallet-treasury:4.0.0-dev", "-p", "sc-peerset:4.0.0-dev", "-p", "sp-consensus-babe:0.10.0-dev", "-p", "sc-client-db:0.10.0-dev", "-p", "sp-state-machine:0.12.0", "-p", "pallet-nomination-pools:1.0.0", "-p", "sc-chain-spec-derive:4.0.0-dev", "-p", "pallet-session:4.0.0-dev", "-p", "sc-network-transactions:0.10.0-dev", "-p", "sp-consensus-slots:0.10.0-dev", "-p", "sc-rpc-server:4.0.0-dev", "-p", "sc-service:0.10.0-dev", "-p", "sc-authority-discovery:0.10.0-dev", "-p", "pallet-recovery:4.0.0-dev", "-p", "sc-consensus-babe-rpc:0.10.0-dev", "-p", "pallet-identity:4.0.0-dev", "-p", "sp-consensus-vrf:0.10.0-dev", "-p", "sc-consensus:0.10.0-dev", "-p", "sp-session:4.0.0-dev", "-p", "generate-bags:4.0.0-dev", "-p", "pallet-beefy-mmr:4.0.0-dev", "-p", "pallet-transaction-payment-rpc:4.0.0-dev", "-p", "sc-consensus-epochs:0.10.0-dev", "-p", "sc-executor-wasmi:0.10.0-dev", "-p", "sp-npos-elections:4.0.0-dev", "-p", "sp-keystore:0.12.0", "-p", "sp-transaction-storage-proof:4.0.0-dev", "-p", "pallet-mmr:4.0.0-dev", "-p", "frame-support-procedural-tools-derive:3.0.0", "-p", "sc-basic-authorship:0.10.0-dev", "-p", "sp-finality-grandpa:4.0.0-dev", "-p", "pallet-proxy:4.0.0-dev", "-p", "sp-sandbox:0.10.0-dev", "-p", "sp-transaction-pool:4.0.0-dev", "-p", "pallet-election-provider-support-benchmarking:4.0.0-dev", "-p", "sp-offchain:4.0.0-dev", "-p", "frame-benchmarking:4.0.0-dev", "-p", "try-runtime-cli:0.10.0-dev", "-p", "sc-finality-grandpa-rpc:0.10.0-dev", "-p", "pallet-nomination-pools-runtime-api:1.0.0-dev", "-p", "sc-tracing:4.0.0-dev", "-p", "sp-std:4.0.0", "-p", "sc-consensus-babe:0.10.0-dev", "-p", "sc-network-gossip:0.10.0-dev", "-p", "sp-consensus:0.10.0-dev", "-p", "sc-consensus-slots:0.10.0-dev", "-p", "pallet-assets:4.0.0-dev", "-p", "pallet-gilt:4.0.0-dev", "-p", "sc-network-sync:0.10.0-dev", "-p", "sc-informant:0.10.0-dev", "-p", "pallet-indices:4.0.0-dev", "-p", "sc-executor-wasmtime:0.10.0-dev", "-p", "sc-network-common:0.10.0-dev", "-p", "sp-arithmetic:5.0.0", "-p", "sc-client-api:4.0.0-dev", "-p", "sp-storage:6.0.0", "-p", "sp-wasm-interface:6.0.0", "-p", "frame-support-procedural-tools:4.0.0-dev", "-p", "pallet-membership:4.0.0-dev", "-p", "remote-externalities:0.10.0-dev", "-p", "sc-transaction-pool-api:4.0.0-dev", "-p", "pallet-tips:4.0.0-dev", "-p", "pallet-mmr-rpc:3.0.0", "-p", "sc-telemetry:4.0.0-dev", "-p", "pallet-sudo:4.0.0-dev", "-p", "sp-inherents:4.0.0-dev", "-p", "pallet-elections-phragmen:5.0.0-dev", "-p", "sp-database:4.0.0-dev", "-p", "sp-io:6.0.0", "-p", "sp-panic-handler:4.0.0", "-p", "frame-system-rpc-runtime-api:4.0.0-dev", "-p", "sp-core-hashing-proc-macro:5.0.0", "-p", "pallet-timestamp:4.0.0-dev", "-p", "pallet-vesting:4.0.0-dev", "-p", "sc-allocator:4.1.0-dev", "-p", "substrate-state-trie-migration-rpc:4.0.0-dev", "-p", "sp-blockchain:4.0.0-dev", "-p", "pallet-fast-unstake:4.0.0-dev", "-p", "pallet-multisig:4.0.0-dev", "-p", "frame-support:4.0.0-dev", "-p", "sc-network:0.10.0-dev", "-p", "sc-cli:0.10.0-dev", "-p", "sp-core:6.0.0", "-p", "pallet-bags-list:4.0.0-dev", "-p", "pallet-preimage:4.0.0-dev", "-p", "sp-keyring:6.0.0", "-p", "sp-maybe-compressed-blob:4.1.0-dev", "-p", "frame-executive:4.0.0-dev", "-p", "pallet-offences-benchmarking:4.0.0-dev", "-p", "sc-state-db:0.10.0-dev", "-p", "frame-benchmarking-cli:4.0.0-dev", "-p", "sc-keystore:4.0.0-dev", "-p", "beefy-gadget:4.0.0-dev", "-p", "sp-runtime:6.0.0", "-p", "sc-rpc:4.0.0-dev", "-p", "sp-runtime-interface-proc-macro:5.0.0", "-p", "sp-tasks:4.0.0-dev", "-p", "sp-tracing:5.0.0", "-p", "sc-utils:4.0.0-dev", "-p", "substrate-frame-rpc-system:4.0.0-dev", "-p", "frame-system:4.0.0-dev", "-p", "pallet-collective:4.0.0-dev", "-p", "pallet-staking-reward-curve:4.0.0-dev", "-p", "sp-authorship:4.0.0-dev", "-p", "sp-core-hashing:4.0.0", "-p", "sc-proposer-metrics:0.10.0-dev", "-p", "pallet-nomination-pools-benchmarking:1.0.0", "-p", "pallet-transaction-payment:4.0.0-dev", "-p", "sp-trie:6.0.0", "-p", "pallet-bounties:4.0.0-dev", "-p", "pallet-grandpa:4.0.0-dev", "-p", "sc-executor:0.10.0-dev", "-p", "substrate-prometheus-endpoint:0.10.0-dev", "-p", "pallet-beefy:4.0.0-dev", "-p", "beefy-primitives:4.0.0-dev", "-p", "sc-chain-spec:4.0.0-dev", "-p", "sc-network-bitswap:0.10.0-dev", "-p", "pallet-offences:4.0.0-dev", "-p", "sc-offchain:4.0.0-dev", "-p", "sp-debug-derive:4.0.0", "-p", "sc-finality-grandpa:0.10.0-dev", "-p", "pallet-staking-reward-fn:4.0.0-dev", "-p", "sp-block-builder:4.0.0-dev", "-p", "sp-staking:4.0.0-dev", "-p", "pallet-authorship:4.0.0-dev", "-p", "pallet-democracy:4.0.0-dev", "-p", "sp-application-crypto:6.0.0", "-p", "pallet-balances:4.0.0-dev", "-p", "sp-rpc:6.0.0", "-p", "frame-system-benchmarking:4.0.0-dev", "-p", "pallet-utility:4.0.0-dev", "-p", "frame-support-test:3.0.0", "-p", "sp-weights:4.0.0", "-p", "beefy-merkle-tree:4.0.0-dev", "-p", "sc-block-builder:0.10.0-dev", "-p", "sc-rpc-api:0.10.0-dev"] in "/storage/repositories/polkadot""
2022-10-03 14:01:10 message="Run git ["status", "--short"] in "/storage/repositories/polkadot""
2022-10-03 14:01:10 message="Run git ["commit", "-am", "update lockfile for {\\"substrate\\"}"] in "/storage/repositories/polkadot""
2022-10-03 14:01:10 message="Run git ["push", "acatangiu", "beefy-request-response-proto"] in "/storage/repositories/polkadot""
2022-10-03 14:01:11 message="Getting the head SHA after a PR branch update in acatangiu/beefy-request-response-proto"
2022-10-03 14:01:11 message="Run git ["rev-parse", "HEAD"] in "/storage/repositories/polkadot""
2022-10-03 14:01:16 message="response '200 OK' for https://api.github.com/repos/paritytech/polkadot/pulls/6035"
2022-10-03 14:01:16 message="Acquiring cleanup_merge_request's recursion prevention lock"
2022-10-03 14:01:16 message="Releasing cleanup_merge_request's recursion prevention lock"
2022-10-03 14:01:16 message="Related dependents of paritytech/polkadot/pull/6035 (key be802e24e177c4367d3562781acdc8d154a06e97): {}"
2022-10-03 14:01:16 message="Cleaning up cleanup_merge_request recursion prevention lock's entries"
2022-10-03 14:01:16 message="response '200 OK' for https://api.github.com/repos/paritytech/polkadot/commits/2cadb32cc7209eb77ca09a98367d3c6d150c7bed/check-runs?per_page=100&page=1"
2022-10-03 14:01:16 message="https://github.com/paritytech/polkadot/pull/6035 check_runs: []"
2022-10-03 14:01:16 message="https://github.com/paritytech/polkadot/pull/6035 latest_checks: {}"
2022-10-03 14:01:16 message="https://github.com/paritytech/polkadot/pull/6035 has successful checks"
2022-10-03 14:01:16 message="response '200 OK' for https://api.github.com/repos/paritytech/polkadot/statuses/2cadb32cc7209eb77ca09a98367d3c6d150c7bed?per_page=100&page=1"
2022-10-03 14:01:16 message="https://github.com/paritytech/polkadot/pull/6035 statuses: []"
2022-10-03 14:01:16 message="https://github.com/paritytech/polkadot/pull/6035 latest_statuses: {}"
2022-10-03 14:01:16 message="https://github.com/paritytech/polkadot/pull/6035 has success status"
2022-10-03 14:01:16 message="Attempting to merge https://github.com/paritytech/polkadot/pull/6035 after companion update"
2022-10-03 14:01:17 message="response '405 Method Not Allowed' for https://api.github.com/repos/paritytech/polkadot/pulls/6035/merge"
2022-10-03 14:01:17 message="response:  Not mergeable
2022-10-03 14:01:17 message="Ignoring merge failure due to pending required status; message: 4 of 4 required status checks are expected."
2022-10-03 14:01:17 message="Companion updated; waiting for checks on https://github.com/paritytech/polkadot/pull/6035"



@ordian ordian changed the title use --precise in cargo update -p sp-io check_dependent_project: use --precise in cargo update -p sp-io Oct 3, 2022
@mordamax mordamax transferred this issue from paritytech/pipeline-scripts Oct 3, 2022
@mordamax mordamax changed the title check_dependent_project: use --precise in cargo update -p sp-io bot merge: companion was updated to old dependency commit Oct 3, 2022
@mordamax mordamax self-assigned this Oct 3, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants