From 9d86178217f549f1fbe3ff0d7ffb74ca01d54a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel@archte.ch>
Date: Tue, 25 Feb 2025 16:10:58 +0100
Subject: [PATCH] ci fixes, use stable virtualcolumn version

---
 .github/workflows/ci.yml    |  2 +-
 .github/workflows/queue.yml | 16 ++++++++++++----
 composer.json               |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef40e072..91699f08 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         include:
-        - laravel: "^11.0"
+        - laravel: "^12.0"
           php: "8.4"
 
     steps:
diff --git a/.github/workflows/queue.yml b/.github/workflows/queue.yml
index 2b3a63c5..cb3937e0 100644
--- a/.github/workflows/queue.yml
+++ b/.github/workflows/queue.yml
@@ -10,11 +10,19 @@ jobs:
     steps:
       - name: Prepare composer version constraint prefix
         run: |
-          BRANCH=${GITHUB_REF#refs/heads/}
-          if [[ $BRANCH =~ ^[0-9]\.x$ ]]; then
-            echo "VERSION_PREFIX=${BRANCH}-dev" >> $GITHUB_ENV
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            # For refs like "refs/tags/v3.9.0", remove "refs/tags/v" prefix to get just "3.9.0"
+            VERSION=${GITHUB_REF#refs/tags/v}
+            echo "VERSION_PREFIX=${VERSION}" >> $GITHUB_ENV
           else
-            echo "VERSION_PREFIX=dev-${BRANCH}" >> $GITHUB_ENV
+            BRANCH=${GITHUB_REF#refs/heads/}
+            if [[ $BRANCH =~ ^[0-9]\.x$ ]]; then
+              # Branches starting with %d.x need to use -dev suffix
+              echo "VERSION_PREFIX=${BRANCH}-dev" >> $GITHUB_ENV
+            else
+              # All other branches use dev-${branch} prefix
+              echo "VERSION_PREFIX=dev-${BRANCH}" >> $GITHUB_ENV
+            fi
           fi
 
       - name: Clone test suite
diff --git a/composer.json b/composer.json
index cbf35487..e3a7faf4 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "spatie/ignition": "^1.4",
         "ramsey/uuid": "^4.7.3",
         "stancl/jobpipeline": "2.0.0-rc5",
-        "stancl/virtualcolumn": "dev-master",
+        "stancl/virtualcolumn": "^1.5.0",
         "spatie/invade": "*",
         "laravel/prompts": "0.*"
     },