From 554002b73cc16130a723ed9bc39494b772e1fea5 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Mon, 21 Jun 2021 21:14:20 -0600 Subject: [PATCH] ci: use versioned cargo wrapper for crate ordering --- ci/order-crates-for-publishing.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/order-crates-for-publishing.py b/ci/order-crates-for-publishing.py index efa5e0aca3..05f572b2a9 100755 --- a/ci/order-crates-for-publishing.py +++ b/ci/order-crates-for-publishing.py @@ -12,10 +12,14 @@ import json import subprocess import sys; +real_file = os.path.realpath(__file__) +ci_path = os.path.dirname(real_file) +src_root = os.path.dirname(ci_path) + def load_metadata(): + cmd = f'{src_root}/cargo metadata --no-deps --format-version=1' return json.loads(subprocess.Popen( - 'cargo metadata --no-deps --format-version=1', - shell=True, stdout=subprocess.PIPE).communicate()[0]) + cmd, shell=True, stdout=subprocess.PIPE).communicate()[0]) def get_packages(): metadata = load_metadata()