From a9c4dbe5122871789c99f3cf2dcb11466c1fe874 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sun, 5 Nov 2023 19:53:11 +0100
Subject: [PATCH] [FORGEJO] upgrade to Forgejo v1.20 & the latest setup-forgejo

---
 .forgejo/workflows/build-release-integration.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.forgejo/workflows/build-release-integration.yml b/.forgejo/workflows/build-release-integration.yml
index 94c74f8..6dda88d 100644
--- a/.forgejo/workflows/build-release-integration.yml
+++ b/.forgejo/workflows/build-release-integration.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           user: root
           password: admin1234
-          image-version: 1.19
+          image-version: 1.20
           lxc-ip-prefix: 10.0.9
 
       - name: publish
@@ -46,13 +46,13 @@ jobs:
           #
           rsync -a --exclude .git ./ $dir/
           rm $(find $dir/.forgejo/workflows/*.yml | grep -v build-release.yml)
-          forgejo-test-helper.sh push $dir $url root runner |& tee $dir/pushed
-          eval $(grep '^sha=' < $dir/pushed)
+          forgejo-test-helper.sh push $dir $url root runner
+          sha=$(forgejo-test-helper.sh branch_tip $url root/runner main)
 
           #
           # Push a tag to trigger the release workflow and wait for it to complete
           #
-          forgejo-test-helper.sh api POST $url repos/root/runner/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/runner/tags
           LOOPS=180 forgejo-test-helper.sh wait_success "$url" root/runner $sha
 
           #