fix: Fix to be able to upgrade third party action with the name attri…

…bute cf. #192
liquidz · Jun 17, 2023 · 32ef2cb · 32ef2cb
1 parent baef607
commit 32ef2cb
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/src/antq/upgrade/github_action.clj b/src/antq/upgrade/github_action.clj
@@ -56,7 +56,7 @@
       (loop [loc loc]
         (if-let [loc (ri.zip/find-next-string loc #(re-seq target-re %))]
           (recur (cond-> loc
-                   (some? (ri.zip/find-ancestor-string loc (action? "DeLaGuardo/setup-clojure")))
+                   (some? (ri.zip/find-previous-string loc (action? "DeLaGuardo/setup-clojure")))
                    (ri.zip/update (update-value (:latest-version version-checked-dep)))
 
                    :always
@@ -68,7 +68,7 @@
   (loop [loc loc]
     (if-let [loc (ri.zip/find-next-string loc #(re-seq #"version\s*:" %))]
       (recur (cond-> loc
-               (some? (ri.zip/find-ancestor-string loc (action? "DeLaGuardo/setup-clj-kondo")))
+               (some? (ri.zip/find-previous-string loc (action? "DeLaGuardo/setup-clj-kondo")))
                (ri.zip/update (update-value (:latest-version version-checked-dep)))
 
                :always
@@ -81,7 +81,7 @@
     (if-let [loc (or (ri.zip/find-next-string loc #(re-seq #"graalvm\s*:" %))
                      (ri.zip/find-next-string loc #(re-seq #"graalvm-version\s*:" %)))]
       (recur (cond-> loc
-               (some? (ri.zip/find-ancestor-string loc (action? "DeLaGuardo/setup-graalvm")))
+               (some? (ri.zip/find-previous-string loc (action? "DeLaGuardo/setup-graalvm")))
                (ri.zip/update (update-value (:latest-version version-checked-dep)))
 
                :always
@@ -93,7 +93,7 @@
   (loop [loc loc]
     (if-let [loc (ri.zip/find-next-string loc #(re-seq #"cljstyle-version\s*:" %))]
       (recur (cond-> loc
-               (some? (ri.zip/find-ancestor-string loc (action? "0918nobita/setup-cljstyle")))
+               (some? (ri.zip/find-previous-string loc (action? "0918nobita/setup-cljstyle")))
                (ri.zip/update (update-value (:latest-version version-checked-dep)))
 
                :always

diff --git a/test/antq/upgrade/github_action_test.clj b/test/antq/upgrade/github_action_test.clj
@@ -95,7 +95,8 @@
             to-deps (->> dummy-clojure-cli-dep
                          (upgrade/upgrader)
                          (dep.gha/extract-deps ""))]
-        (t/is (= #{{:name "clojure/brew-install" :version {:- 1 :+ "9.0.0"}}}
+        (t/is (= #{{:name "clojure/brew-install" :version {:- 1 :+ "9.0.0"}}
+                   {:name "clojure/brew-install" :version {:- -1 :+ "9.0.0"}}}
                  (h/diff-deps from-deps to-deps)))))
 
     (t/testing "leiningen"
@@ -105,7 +106,8 @@
             to-deps (->> dummy-leiningen-dep
                          (upgrade/upgrader)
                          (dep.gha/extract-deps ""))]
-        (t/is (= #{{:name "technomancy/leiningen" :version {:- 2 :+ "9.0.0"}}}
+        (t/is (= #{{:name "technomancy/leiningen" :version {:- 2 :+ "9.0.0"}}
+                   {:name "technomancy/leiningen" :version {:- -2 :+ "9.0.0"}}}
                  (h/diff-deps from-deps to-deps)))))
 
     (t/testing "boot"
@@ -115,7 +117,8 @@
             to-deps (->> dummy-boot-dep
                          (upgrade/upgrader)
                          (dep.gha/extract-deps ""))]
-        (t/is (= #{{:name "boot-clj/boot" :version {:- 3 :+ "9.0.0"}}}
+        (t/is (= #{{:name "boot-clj/boot" :version {:- 3 :+ "9.0.0"}}
+                   {:name "boot-clj/boot" :version {:- -3 :+ "9.0.0"}}}
                  (h/diff-deps from-deps to-deps))))))
 
   (t/testing "clj-kondo"
@@ -125,7 +128,8 @@
           to-deps (->> dummy-clj-kondo-dep
                        (upgrade/upgrader)
                        (dep.gha/extract-deps ""))]
-      (t/is (= #{{:name "clj-kondo/clj-kondo" :version {:- "5" :+ "9.0.0"}}}
+      (t/is (= #{{:name "clj-kondo/clj-kondo" :version {:- "5" :+ "9.0.0"}}
+                 {:name "clj-kondo/clj-kondo" :version {:- "-5" :+ "9.0.0"}}}
                (h/diff-deps from-deps to-deps)))))
 
   (t/testing "graalvm"
@@ -135,7 +139,8 @@
           to-deps (->> dummy-graalvm-dep
                        (upgrade/upgrader)
                        (dep.gha/extract-deps ""))]
-      (t/is (= #{{:name "graalvm/graalvm-ce-builds" :version {:- "6" :+ "9.0.0"}}}
+      (t/is (= #{{:name "graalvm/graalvm-ce-builds" :version {:- "6" :+ "9.0.0"}}
+                 {:name "graalvm/graalvm-ce-builds" :version {:- "-6" :+ "9.0.0"}}}
                (h/diff-deps from-deps to-deps)))))
 
   (t/testing "cljstyle"
@@ -145,5 +150,6 @@
           to-deps (->> dummy-cljstyle-dep
                        (upgrade/upgrader)
                        (dep.gha/extract-deps ""))]
-      (t/is (= #{{:name "greglook/cljstyle" :version {:- "7" :+ "9.0.0"}}}
+      (t/is (= #{{:name "greglook/cljstyle" :version {:- "7" :+ "9.0.0"}}
+                 {:name "greglook/cljstyle" :version {:- "-7" :+ "9.0.0"}}}
                (h/diff-deps from-deps to-deps))))))
diff --git a/test/resources/dep/test_github_action_third_party.yml b/test/resources/dep/test_github_action_third_party.yml
@@ -19,3 +19,23 @@ jobs:
       - uses: 0918nobita/setup-cljstyle@master
         with:
           cljstyle-version: "7"
+
+      - name: with name
+        uses: DeLaGuardo/setup-clojure@master
+        with:
+          cli: -1
+          lein: -2
+          boot: -3
+          bb: -4
+      - name: with name
+        uses: DeLaGuardo/setup-clj-kondo@master
+        with:
+          version: '-5'
+      - name: with name
+        uses: DeLaGuardo/setup-graalvm@master
+        with:
+          graalvm: -6
+      - name: with name
+        uses: 0918nobita/setup-cljstyle@master
+        with:
+          cljstyle-version: "-7"