From 8721a716b2573f2d78c8b89ee88e0b02cac26654 Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Thu, 16 May 2024 11:31:18 +1000 Subject: [PATCH 1/2] Attempt to fix pypi/publish action. Not clear how it came to be broken. --- scripts/mk-pip-tree.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/mk-pip-tree.sh b/scripts/mk-pip-tree.sh index e95dfb91a..029b192a5 100755 --- a/scripts/mk-pip-tree.sh +++ b/scripts/mk-pip-tree.sh @@ -13,10 +13,10 @@ create_pip_tree() { local out="${dst}/${base}" mkdir -p "${out}" - echo "${src}/${w}"* "-> ${out}/" - echo "${src}/${base}"*tar.gz "-> ${out}/" - cp "${src}/${w}"*.whl "${out}/" - cp "${src}/${base}"*.tar.gz "${out}/" + echo "${src}/${w}"*.whl "-> ${out}/" + echo "${src}/${w}"*tar.gz "-> ${out}/" + cp "${src}/${w}"* "${out}/" + cp "${src}/${w}"*.tar.gz "${out}/" done } From 06e1d3aadcfda5b40569fee609dffb4b647ab053 Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Thu, 16 May 2024 11:53:08 +1000 Subject: [PATCH 2/2] Fix inconsistencies, don't mutate and perpetuate them! --- scripts/mk-pip-tree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mk-pip-tree.sh b/scripts/mk-pip-tree.sh index 029b192a5..82e87a182 100755 --- a/scripts/mk-pip-tree.sh +++ b/scripts/mk-pip-tree.sh @@ -15,7 +15,7 @@ create_pip_tree() { echo "${src}/${w}"*.whl "-> ${out}/" echo "${src}/${w}"*tar.gz "-> ${out}/" - cp "${src}/${w}"* "${out}/" + cp "${src}/${w}"*.whl "${out}/" cp "${src}/${w}"*.tar.gz "${out}/" done }