From f473c6bed57ae6616fedeff9af3835a5cfca22d9 Mon Sep 17 00:00:00 2001
From: Tim Besard <tim.besard@gmail.com>
Date: Wed, 10 Jan 2024 13:36:31 +0100
Subject: [PATCH] Rework CI selection.

---
 .github/workflows/ci.yml | 34 +++++++++++++++++-----------------
 test/runtests.jl         |  5 ++++-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4d2a1411..f9850c2e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,24 +17,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version:
-          - '1.7'
-          - '1.8'
-          - '1.9'
-          - '1.10'
-        os:
-          - ubuntu-latest
-        arch:
-          - x64
-        test_julia:
-          - "v1.6.7"              # release from versions.json
-          - "nightly"             # special releases
-          - "stable"
-          - "master~10"           # directly from Git, likely built by CI
-          - "master"              # directly from Git, force a build (see below)
+        version: ['1.7', '1.8', '1.9', '1.10']
+        os: ['ubuntu-latest']
+        arch: [x64]
+        test_julia: ['']
+        test_buildflags: ['']
         include:
-          - test_julia: "master"
-            test_buildflags: "JULIA_CPU_TARGET=native JULIA_PRECOMPILE=0"
+          # special releases
+          - version: '1.10'
+            test_julia: 'nightly'
+          - version: '1.10'
+            test_julia: 'stable'
+          # directly from Git, likely built by CI
+          - version: '1.10'
+            test_julia: 'master~10'
+          # directly from Git, force a build (see below)
+          - version: '1.10'
+            test_julia: 'master'
+            test_buildflags: 'JULIA_CPU_TARGET=native JULIA_PRECOMPILE=0'
     env:
       JULIA_DEBUG: PkgEval
       JULIA: ${{ matrix.test_julia }}
diff --git a/test/runtests.jl b/test/runtests.jl
index 234455a6..4a9bd082 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -2,7 +2,10 @@ using PkgEval
 using Test
 using Git
 
-julia = get(ENV, "JULIA", "v"*string(VERSION))
+julia = get(ENV, "JULIA", "")
+if isempty(julia)
+    julia = "v"*string(VERSION)
+end
 julia_release = if contains(julia, r"^v\d")
     parse(VersionNumber, julia)
 else