Rework CI selection.

JuliaCI · Jan 10, 2024 · f473c6b · f473c6b
1 parent 14e3228
commit f473c6b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git 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
@@ -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