From ee2cd89581cbf952d6b0eafbdf0efbc58adfd8a1 Mon Sep 17 00:00:00 2001 From: Benoit Date: Tue, 22 Oct 2024 19:18:56 +0900 Subject: [PATCH 1/2] Forgejo: Bump to 9.0.0 --- cfg/jobs/forgejo.run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg/jobs/forgejo.run b/cfg/jobs/forgejo.run index d076a00..f0328f9 100755 --- a/cfg/jobs/forgejo.run +++ b/cfg/jobs/forgejo.run @@ -7,7 +7,7 @@ DIST="${IMAGE%%/*}" VER="${IMAGE#*/}" VER="${VER%/*}" VER="${VER//./-}" -UPSTREAM_VER="8.0.3" +UPSTREAM_VER="9.0.0" UPSTREAM_VER_DASH="${UPSTREAM_VER//./-}" UPSTREAM_NAME="forgejo" SERIAL="1benoitjpnet" From b4e481e44d3ed21d17eb3ad25cc4a6cba3ab4ad5 Mon Sep 17 00:00:00 2001 From: Benoit Date: Tue, 22 Oct 2024 19:20:08 +0900 Subject: [PATCH 2/2] Forgejo: Update wait network logic --- cfg/jobs/forgejo.run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/jobs/forgejo.run b/cfg/jobs/forgejo.run index f0328f9..8e0a6cb 100755 --- a/cfg/jobs/forgejo.run +++ b/cfg/jobs/forgejo.run @@ -17,8 +17,8 @@ ALIAS="$UPSTREAM_NAME-$UPSTREAM_VER-$SERIAL" cd $WORKSPACE incus launch images:$IMAGE $CNAME --quiet -# Wait network -sleep 5 +# Wait for network +timeout 30 bash -c "until incus exec $CNAME -- ping -c1 google.com &>/dev/null; do sleep 1; done" # Forgejo incus exec $CNAME -- mkdir /etc/esh