From 3b304c88265d0c8917c4df91d71abc27dd14844a Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Tue, 23 Apr 2024 16:17:31 -0600 Subject: [PATCH 1/3] =?UTF-8?q?Move=20=E2=80=9CGenerated=20N=20variants?= =?UTF-8?q?=E2=80=9D=20to=20generate-dockerfiles!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/docker_clojure/core.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker_clojure/core.clj b/src/docker_clojure/core.clj index acdef8e0..a1e2a384 100644 --- a/src/docker_clojure/core.clj +++ b/src/docker_clojure/core.clj @@ -175,6 +175,7 @@ (while ( Date: Tue, 23 Apr 2024 16:17:50 -0600 Subject: [PATCH 2/3] Update lib deps to latest versions --- bb.edn | 2 +- deps.edn | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bb.edn b/bb.edn index cc140452..d1828062 100644 --- 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 index d3a4895f..056aad8b 100644 --- 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"]}}} From 22805959e17e612b5eb312da9a0aaf0f9b5fd15f Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Tue, 23 Apr 2024 16:18:13 -0600 Subject: [PATCH 3/3] Update CI actions & installs to latest versions --- .github/workflows/ci.yml | 4 ++-- .github/workflows/official-images-pr.yml | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3ea76cf..d2773cdc 100644 --- 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/setup-clojure@10.1 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 index cbb3bdcf..c5a6d4c8 100644 --- 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,11 +50,11 @@ 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 @@ -62,12 +62,12 @@ jobs: 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