Fix DeLaGuardo/setup-graalvm detector to support v4.0 #70

liquidz · Mar 29, 2021 · 5921a56 · 5921a56
1 parent feaec14
commit 5921a56
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/antq/dep/github_action/third_party.clj b/src/antq/dep/github_action/third_party.clj
@@ -46,7 +46,11 @@
 
 (defmethod detect "DeLaGuardo/setup-graalvm"
   [form]
-  (when-let [v (get-in form [:with :graalvm-version])]
+  (when-let [v (or
+                ;; before v4.0
+                (get-in form [:with :graalvm-version])
+                ;; v4.0 or later
+                (get-in form [:with :graalvm]))]
     [(u.dep/normalize-by-name
       (r/map->Dependency
        {:name "graalvm/graalvm-ce-builds"

diff --git a/test/antq/dep/github_action/third_party_test.clj b/test/antq/dep/github_action/third_party_test.clj
@@ -55,10 +55,16 @@
                         :with {:version "1.0.0"}}))))
 
 (t/deftest detect-setup-graalvm-test
-  (t/is (= [(git-tag-dependency {:name "graalvm/graalvm-ce-builds"
-                                 :version "19.3.0"})]
-           (sut/detect {:uses "DeLaGuardo/setup-graalvm@main"
-                        :with {:graalvm-version "19.3.0.java8"}}))))
+  (t/testing "before v4.0"
+    (t/is (= [(git-tag-dependency {:name "graalvm/graalvm-ce-builds"
+                                   :version "19.3.0"})]
+             (sut/detect {:uses "DeLaGuardo/setup-graalvm@main"
+                          :with {:graalvm-version "19.3.0.java8"}}))))
+  (t/testing "v4.0 or later"
+    (t/is (= [(git-tag-dependency {:name "graalvm/graalvm-ce-builds"
+                                   :version "19.3.0"})]
+             (sut/detect {:uses "DeLaGuardo/setup-graalvm@main"
+                          :with {:graalvm "19.3.0.java8"}})))))
 
 (t/deftest detect-setup-cljstyle-test
   (t/is (= [(git-tag-dependency {:name "greglook/cljstyle"