Merge pull request #227 from Quantisan/update/deps-and-actions

Update deps and actions
Quantisan · Apr 23, 2024 · d5aa83d · d5aa83d
2 parents 3f25b3a + 2280595
commit d5aa83d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,12 +6,12 @@ jobs:
   test:
 
     runs-on: ubuntu-latest
-    
+
     steps:
     - name: Install babashka
       uses: DeLaGuardo/[email protected]
       with:
-        bb: 1.0.168
+        bb: 1.3.190
     - uses: actions/checkout@v3
     - name: Check for stale Dockerfiles
       run: |

diff --git a/.github/workflows/official-images-pr.yml b/.github/workflows/official-images-pr.yml
@@ -12,15 +12,15 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Install babashka
-        uses: DeLaGuardo/setup-clojure@10.1
+        uses: DeLaGuardo/setup-clojure@12.5
         with:
-          bb: 1.3.176
+          bb: 1.3.190
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Generate manifest
         run: bb run manifest target/docker.manifest
       - name: Upload manifest artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: manifest
           path: target/docker.manifest
@@ -32,12 +32,12 @@ jobs:
       diff: ${{ steps.manifest-diff.outputs.diff }}
     steps:
       - name: Checkout docker-library/official-images repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: docker-library/official-images
           path: official-images
       - name: Download manifest artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: manifest
       - name: Compare manifest files
@@ -50,24 +50,24 @@ jobs:
     if: contains(needs.compare-manifests.outputs.diff, 'differ')
     steps:
       - name: Download manifest artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: manifest
       - name: Checkout docker-library/official-images repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: docker-library/official-images
           path: official-images
       - name: Copy manifest into official-images library
         run: cp docker.manifest official-images/library/clojure
       - name: Get user email
         id: email
-        uses: evvanErb/get-github-email-by-username-action@v1.25
+        uses: evvanErb/get-github-email-by-username-action@v2.0
         with:
           github-username: ${{ github.actor }}
           token: ${{ secrets.API_TOKEN_GITHUB }}
       - name: Open official-images pull request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.API_TOKEN_GITHUB }}
           path: official-images

diff --git a/bb.edn b/bb.edn
@@ -1,7 +1,7 @@
 {:paths ["src"]
  :deps  {local/deps              {:local/root "."}
          org.babashka/spec.alpha {:git/url "https://github.com/babashka/spec.alpha"
-                                  :git/sha "1a841c4cc1d4f6dab7505a98ed2d532dd9d56b78"}}
+                                  :git/sha "951b49b8c173244e66443b8188e3ff928a0a71e7"}}
  :tasks
  {:requires    ([docker-clojure.core :as dc])
   clean        (dc/-main "clean")

diff --git a/deps.edn b/deps.edn
@@ -1,7 +1,7 @@
 {:deps
- {org.clojure/clojure            {:mvn/version "1.11.1"}
-  org.clojure/math.combinatorics {:mvn/version "0.1.6"}
-  org.clojure/core.async         {:mvn/version "1.5.648"}}
+ {org.clojure/clojure            {:mvn/version "1.11.2"}
+  org.clojure/math.combinatorics {:mvn/version "0.3.0"}
+  org.clojure/core.async         {:mvn/version "1.6.681"}}
 
  :paths ["src" "resources"]
 
@@ -12,5 +12,5 @@
 
   :test {:extra-paths ["test"]
          :extra-deps  {com.cognitect/test-runner {:git/url "https://github.com/cognitect-labs/test-runner.git"
-                                                  :sha     "4e7e1c0dfd5291fa2134df052443dc29695d8cbe"}}
+                                                  :sha     "7284cda41fb9edc0f3bc6b6185cfb7138fc8a023"}}
          :main-opts   ["-m" "cognitect.test-runner"]}}}
diff --git a/src/docker_clojure/core.clj b/src/docker_clojure/core.clj
@@ -175,6 +175,7 @@
     (while (<!! builds-ch))))
 
 (defn generate-dockerfiles! [installer-hashes variants]
+  (log "Generated" (count variants) "variants")
   (doseq [variant variants]
     (generate-dockerfile! installer-hashes variant)))
 
@@ -235,7 +236,6 @@
   [{:keys [cmd args parallelization]}]
   (logger/start)
   (let [variants (generate-variants args)]
-    (log "Generated" (count variants) "variants")
     (case cmd
       :clean (df/clean-all)
       :dockerfiles (generate-dockerfiles! cfg/installer-hashes variants)