From 28e92a3775da2eee1c2c9936b1627d8561441f87 Mon Sep 17 00:00:00 2001
From: Daniel Spiewak <djspiewak@gmail.com>
Date: Wed, 1 Dec 2021 16:23:40 -0700
Subject: [PATCH] Fixed Java matrix exclusions

---
 src/main/scala/sbtghactions/GenerativePlugin.scala  |  2 +-
 .../scala/sbtghactions/GenerativePluginSpec.scala   | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbtghactions/GenerativePlugin.scala b/src/main/scala/sbtghactions/GenerativePlugin.scala
index e8c2fb1..f635db0 100644
--- a/src/main/scala/sbtghactions/GenerativePlugin.scala
+++ b/src/main/scala/sbtghactions/GenerativePlugin.scala
@@ -342,7 +342,7 @@ ${indent(rendered.mkString("\n"), 1)}"""
     } mkString "\n"
 
     // TODO refactor all of this stuff to use whitelist instead
-    val whitelist = Map("os" -> job.oses, "scala" -> job.scalas, "java" -> job.javas) ++ job.matrixAdds
+    val whitelist = Map("os" -> job.oses, "scala" -> job.scalas, "java" -> job.javas.map(_.render)) ++ job.matrixAdds
 
     def checkMatching(matching: Map[String, String]): Unit = {
       matching foreach {
diff --git a/src/test/scala/sbtghactions/GenerativePluginSpec.scala b/src/test/scala/sbtghactions/GenerativePluginSpec.scala
index a4f9b2d..66da4bb 100644
--- a/src/test/scala/sbtghactions/GenerativePluginSpec.scala
+++ b/src/test/scala/sbtghactions/GenerativePluginSpec.scala
@@ -790,6 +790,19 @@ class GenerativePluginSpec extends Specification {
         "") must throwA[RuntimeException]
     }
 
+    "allow a matching JVM exclusion" in {
+      compileJob(
+        WorkflowJob(
+          "bippy",
+          "Bippity Bop Around the Clock",
+          List(
+            WorkflowStep.Run(List("echo ${{ matrix.scala }}"))),
+          matrixExcs = List(
+            MatrixExclude(
+              Map("java" -> JavaSpec.temurin("11").render)))),
+        "") must not(throwA[RuntimeException])
+    }
+
     "compile a job with a long list of scala versions" in {
       val results = compileJob(
         WorkflowJob(