From 0a60b3d033f1d029c22810a93fa85e3704fdb84c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 2 Feb 2024 20:59:56 +0100
Subject: [PATCH] ci: Add freebsd executable to releases

This was temporarily disabled, because of timeouts in Cirrus. This seems to work well again.
---
 .github/get_cirrusci_freebsd | 20 ++++++++++++--------
 .github/workflows/ci.yaml    |  5 ++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/get_cirrusci_freebsd b/.github/get_cirrusci_freebsd
index d242617397..3be8370115 100755
--- a/.github/get_cirrusci_freebsd
+++ b/.github/get_cirrusci_freebsd
@@ -13,22 +13,26 @@ gh_accept_header="Accept: application/vnd.github.v3+json"
 get_gh_check_runs_url() {
   gh_checks_list_url="https://api.github.com/repos/$GITHUB_REPOSITORY/commits/$GITHUB_COMMIT/check-suites"
   >&2 echo "Getting list of check-suites from $gh_checks_list_url ..."
-  curl --fail -H "$gh_auth_header" -H "$gh_accept_header"  "$gh_checks_list_url" \
+  curl -s --fail -H "$gh_auth_header" -H "$gh_accept_header"  "$gh_checks_list_url" \
     | jq -r '.check_suites[] | select(.app.slug == "cirrus-ci") | .check_runs_url'
 }
 
 wait_for_cirrusci() {
-  gh_check_runs_url="$(get_gh_check_runs_url)"
   >&2 echo "Waiting to CirrusCI run to complete (two hours maximum)..."
   for _ in $(seq 1 120); do
-    echo "Checking for CirrusCI task status at $gh_check_runs_url ..."
-    status=$(curl --fail -H "$gh_auth_header" "$gh_check_runs_url" | jq -r '.check_runs[] | .status')
-    if [ "$status" == "completed" ]; then
-      break
+    gh_check_runs_url="$(get_gh_check_runs_url)"
+    if [ -z "$gh_check_runs_url" ]; then
+      echo "CirrusCI task has not started, yet. Waiting..."
     else
-      echo "CirrusCI task is still $status, waiting..."
-      sleep 60
+      echo "Checking for CirrusCI task status at $gh_check_runs_url ..."
+      status=$(curl -s --fail -H "$gh_auth_header" "$gh_check_runs_url" | jq -r '.check_runs[] | .status')
+      if [ "$status" == "completed" ]; then
+        break
+      else
+        echo "CirrusCI task is still $status, waiting..."
+      fi
     fi
+    sleep 60
   done
 }
 
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index da1f34112a..762f1811d3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -422,9 +422,8 @@ jobs:
           tar cJvf "release-bundle/postgrest-v$VERSION-macos-x64.tar.xz" \
             -C artifacts/postgrest-macos-x64 postgrest
 
-          # TODO: Fix timeouts for FreeBSD builds in Cirrus
-          #tar cJvf "release-bundle/postgrest-v$VERSION-freebsd-x64.tar.xz" \
-          #  -C artifacts/postgrest-freebsd-x64 postgrest
+          tar cJvf "release-bundle/postgrest-v$VERSION-freebsd-x64.tar.xz" \
+            -C artifacts/postgrest-freebsd-x64 postgrest
 
           tar cJvf "release-bundle/postgrest-v$VERSION-ubuntu-aarch64.tar.xz" \
             -C artifacts/postgrest-ubuntu-aarch64 postgrest