From 2f38a7c60120dbc53a7aa446ec9e4a7cf551f730 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 8 Apr 2023 15:54:52 +0800 Subject: [PATCH] fix(ci): mg (#362) * fix(ci): mg * fix: version + release (?) Signed-off-by: madomado * fix: rel Signed-off-by: madomado --------- Signed-off-by: madomado --- .github/workflows/mg.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mg.sh b/.github/workflows/mg.sh index 2078f87d5a..cb0afcabd4 100755 --- a/.github/workflows/mg.sh +++ b/.github/workflows/mg.sh @@ -1,12 +1,16 @@ if $1; then - dirs=${$2/\/pkg/} - export p="{\"id\":\"$5\",\"verl\":\"%v\",\"arch\":\"$4\",\"dirs\":\"$dirs\"}" + dirs=$2 + dirs=${dirs/\/pkg/} + export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\"}" else - export p="{\"id\":\"$5\",\"verl\":\"%v\",\"arch\":\"$4\"}" + export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\"}" fi for f in anda-build/rpm/rpms/*; do n=$(lesspipe.sh $f | grep -E "Name\s*: " | sed "s@Name\s*: @@") - v=$(echo ${f/${n}-/} | sed -E "s@\.fc$3.+@@") - curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d ${p/%v/$v} --fail-with-body & + v=$(lesspipe.sh $f | grep -E "Version\s*: " | sed "s@Version\s*: @@") + r=$(lesspipe.sh $f | grep -E "Release\s*: " | sed "s@Release\s*: @@") + d=${p/\%v/$v} + d=${d/\%r/$r} + curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body & done wait