From 6dc0f6a3dc774598908e96c0030f434ad6c2af09 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 9 Oct 2023 19:16:32 +0200 Subject: [PATCH] [CI] Forgejo Actions based release process (squash) use forgejo-curl.sh --- .forgejo/workflows/build-release-integration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-release-integration.yml b/.forgejo/workflows/build-release-integration.yml index d893bd39af..2920729d33 100644 --- a/.forgejo/workflows/build-release-integration.yml +++ b/.forgejo/workflows/build-release-integration.yml @@ -55,13 +55,13 @@ jobs: cp -a .forgejo/actions $dir/.forgejo/actions cp $dir/Dockerfile $dir/Dockerfile.rootless - forgejo-test-helper.sh push $dir $url root forgejo |& tee $dir/pushed - eval $(grep '^sha=' < $dir/pushed) + forgejo-test-helper.sh push $dir $url root forgejo + sha=$(forgejo-test-helper.sh branch_tip $url root/forgejo main) # # Push a tag to trigger the release workflow and wait for it to complete # - forgejo-test-helper.sh api POST $url repos/root/forgejo/tags ${{ steps.forgejo.outputs.token }} --data-raw '{"tag_name": "v'$version'", "target": "'$sha'"}' + forgejo-curl.sh api_json --data-raw '{"tag_name": "v'$version'", "target": "'$sha'"}' $url/api/v1/repos/root/forgejo/tags LOOPS=180 forgejo-test-helper.sh wait_success "$url" root/forgejo $sha #