From 59b507b48f1f5d5dfb5e30bef3510344221f882e Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 4 Jan 2024 10:50:04 -0600
Subject: [PATCH] build-from-source: exclude RC (release candidate) versions

---
 .../build-from-source.factor                  | 23 ++++++++++++++-----
 .../build-from-source/windows/windows.factor  |  8 +++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/extra/build-from-source/build-from-source.factor b/extra/build-from-source/build-from-source.factor
index d418e7654a..42cd94c0ec 100644
--- a/extra/build-from-source/build-from-source.factor
+++ b/extra/build-from-source/build-from-source.factor
@@ -299,9 +299,11 @@ ERROR: no-output-file path ;
 
 : pcre2-versions ( -- seq )
     "PCRE2Project" "pcre2" "pcre2-" list-repository-tags-matching
-    tag-refs
-    [ "-" split length 2 = ] filter
-    human-sort ;
+    tag-refs human-sort ;
+
+: pcre2-release-versions ( -- seq )
+    pcre2-versions
+    [ "-" split length 2 = ] filter ;
 
 : lz4-versions ( -- seq )
     "lz4" "lz4" "v" list-repository-tags-matching
@@ -325,18 +327,27 @@ ERROR: no-output-file path ;
 
 : postgres-versions ( -- seq )
     "postgres" "postgres" "REL_" list-repository-tags-matching
-    tag-refs
-    ! [ "_" split1-last nip [ digit? ] all? ] filter ! no RC1 or BETA1
-    human-sort ;
+    tag-refs human-sort ;
+
+: postgres-release-versions ( -- seq )
+    postgres-versions
+    ! no RC1 or BETA1
+    [ "_" split1-last nip [ digit? ] all? ] filter ;
 
 : raylib-versions ( -- seq )
     "raysan5" "raylib" "" list-repository-tags-matching
     tag-refs human-sort ;
 
+: raylib-release-versions ( -- seq )
+    raylib-versions [ "-" swap subseq? ] reject ;
+
 : raygui-versions ( -- seq )
     "raysan5" "raygui" "" list-repository-tags-matching
     tag-refs human-sort ;
 
+: raygui-release-versions ( -- seq )
+    raygui-versions [ "-" swap subseq? ] reject ;
+
 : ripgrep-versions ( -- seq )
     "BurntSushi" "ripgrep" "" list-repository-tags-matching
     tag-refs
diff --git a/extra/build-from-source/windows/windows.factor b/extra/build-from-source/windows/windows.factor
index 2ab606de33..bc45a30fe7 100644
--- a/extra/build-from-source/windows/windows.factor
+++ b/extra/build-from-source/windows/windows.factor
@@ -208,7 +208,7 @@ IN: build-from-source.windows
     ] with-tar-gz ;
 
 : build-pcre2-dll ( -- )
-    "PCRE2Project" "pcre2" pcre2-versions last [
+    "PCRE2Project" "pcre2" pcre2-release-versions last [
         [
             32-bit? [
                 qw{ cmake -A Win32 -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPCRE2_SUPPORT_UNICODE=ON -DPCRE2_SUPPORT_LIBZ=OFF -DPCRE2_SUPPORT_LIBBZ2=OFF -DPCRE2_SUPPORT_LIBEDIT=OFF -DPCRE2_SUPPORT_LIBREADLINE=OFF .. } try-process
@@ -223,7 +223,7 @@ IN: build-from-source.windows
 
 ! choco install -y meson winflexbison3
 : build-postgres-dll ( -- )
-    "postgres" "postgres" postgres-versions last [
+    "postgres" "postgres" postgres-release-versions last [
         "src/tools/msvc/clean.bat" prepend-current-path try-process
         qw{ meson setup build } try-process
         "build" prepend-current-path
@@ -233,7 +233,7 @@ IN: build-from-source.windows
 
 ! choco install -y glfw3
 : build-raylib-dll ( -- )
-    "raysan5" "raylib" raylib-versions last [
+    "raysan5" "raylib" raylib-release-versions last [
         [
             32-bit? [
                 qw{ cmake -A Win32 -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -DUSE_EXTERNAL_GLFW=OFF .. } try-process
@@ -247,7 +247,7 @@ IN: build-from-source.windows
     ] with-github-worktree-tag ;
 
 :: build-raygui-dll ( -- )
-    "raysan5" "raygui" raygui-versions last [
+    "raysan5" "raygui" raygui-release-versions last [
         "raysan5" "raylib" raylib-versions last github-tag-disk-checkout-path :> $raylib-dir
         $raylib-dir "src" append-path :> $raylib-src
         $raylib-dir "build/raylib/Release/raylib.lib" append-path :> $raylib-lib
-- 
2.34.1