From 82b28bb6f302f360c5524aa589da1defa6c0e520 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 30 Aug 2026 13:35:44 -0400 Subject: [PATCH] Bust the CDN cache when reading published channel dbs pkgs.omarchy.org sits behind Cloudflare, and right after a sync the plain db URL keeps serving the previous file from the edge cache (observed: a cache HIT with age 900s+ returning the pre-release db). That made status report the old version, wait_for_published poll a frozen file for its full timeout, and would let RC auto-numbering count from last release's versions. A unique query string per fetch skips the cached entry. --- bin/omarchy-pkgs | 6 +++++- bin/omarchy-release | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bin/omarchy-pkgs b/bin/omarchy-pkgs index 73467fa..58ff646 100755 --- a/bin/omarchy-pkgs +++ b/bin/omarchy-pkgs @@ -102,7 +102,11 @@ pkgbuild_var() { published_edge_version() { local pkg="$1" tmp descs tmp=$(mktemp) || return 2 - if ! curl -sf "$EDGE_DB_URL" -o "$tmp"; then + # Bust the CDN cache — a stale db here mis-numbers the next rcN or lets an + # ordering check run against last release's versions. + local sep='?' + [[ "$EDGE_DB_URL" == *\?* ]] && sep='&' + if ! curl -sf "$EDGE_DB_URL$sep$(date +%s%N)" -o "$tmp"; then rm -f "$tmp" return 2 fi diff --git a/bin/omarchy-release b/bin/omarchy-release index 25d31fa..915aa8d 100755 --- a/bin/omarchy-release +++ b/bin/omarchy-release @@ -176,7 +176,10 @@ ensure_work_clone() { published_version() { local channel="$1" tmp descs tmp=$(mktemp) || return 2 - if ! curl -sf "$PKGS_DB_BASE/$channel/x86_64/omarchy.db.tar.zst" -o "$tmp"; then + # A unique query string busts the CDN cache: right after a sync the plain + # URL can keep serving the previous db for a while, which reads as "not + # published yet" to status, the wait loop, and ship's pre-checks. + if ! curl -sf "$PKGS_DB_BASE/$channel/x86_64/omarchy.db.tar.zst?$(date +%s%N)" -o "$tmp"; then rm -f "$tmp" return 2 fi