From 5537a1ec768be3baa844c934b635c0d25248335d Mon Sep 17 00:00:00 2001 From: fap <459631+fapdash@users.noreply.github.com> Date: Fri, 19 May 2023 20:53:51 +0200 Subject: [PATCH] Upgrade test-runner dependencies - upgrade base image to latest Temurin 17 image - upgrade nodejs to latest LTS - upgrade nbb to latest - upgrade Clojure and Clojurescript to latest --- Dockerfile | 8 ++++---- deps.edn | 4 ++-- tests/example-all-fail/deps.edn | 4 ++-- tests/example-all-fail/expected_results.json | 2 +- tests/example-empty-file/deps.edn | 4 ++-- tests/example-empty-file/expected_results.json | 2 +- tests/example-partial-fail/deps.edn | 4 ++-- tests/example-success/deps.edn | 4 ++-- tests/example-syntax-error/deps.edn | 4 ++-- tests/example-syntax-error/expected_results.json | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index c6da403..bca3046 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM clojure:openjdk-17-tools-deps-1.10.3.822-slim-buster +FROM clojure:temurin-17-tools-deps-1.11.1.1273-bullseye-slim RUN apt-get update && \ - apt-get install -y curl jq && \ - curl -fsSL https://deb.nodesource.com/setup_15.x | bash - && \ + apt-get install -y curl jq && \ + curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ apt-get install -y nodejs && \ rm -rf /var/lib/apt/lists/* && \ apt-get purge --auto-remove && \ apt-get clean -RUN npm install -g nbb@0.0.92 +RUN npm install -g nbb@1.2.173 WORKDIR /opt/test-runner diff --git a/deps.edn b/deps.edn index c634405..a5b1e0c 100644 --- a/deps.edn +++ b/deps.edn @@ -1,4 +1,4 @@ {:deps - {org.clojure/clojure {:mvn/version "1.10.1"} - org.clojure/clojurescript {:mvn/version "1.10.773"} + {org.clojure/clojure {:mvn/version "1.11.1"} + org.clojure/clojurescript {:mvn/version "1.11.60"} olical/cljs-test-runner {:mvn/version "3.8.0"}}} diff --git a/tests/example-all-fail/deps.edn b/tests/example-all-fail/deps.edn index 5c65da5..9554aae 100644 --- a/tests/example-all-fail/deps.edn +++ b/tests/example-all-fail/deps.edn @@ -1,6 +1,6 @@ {:deps - {org.clojure/clojure {:mvn/version "1.10.1"} - org.clojure/clojurescript {:mvn/version "1.10.773"}} + {org.clojure/clojure {:mvn/version "1.11.1"} + org.clojure/clojurescript {:mvn/version "1.11.60"}} :aliases {:test diff --git a/tests/example-all-fail/expected_results.json b/tests/example-all-fail/expected_results.json index 55a222b..61aa0df 100644 --- a/tests/example-all-fail/expected_results.json +++ b/tests/example-all-fail/expected_results.json @@ -1,5 +1,5 @@ { "version": 1, "status": "fail", - "message": "Testing example-all-fail-test\nTesting example-all-fail-test\n\n\nERROR in (year-not-divisible-by-4) (:13:9)\nERROR in (year-not-divisible-by-4) (:13:9)\nexpected: (not (example-all-fail/leap-year? 2999))\nexpected: (not (example-all-fail/leap-year? 2999))\n actual: #object[Error Error: Cannot call false as a function.]\n actual: #object[Error Error: Cannot call false as a function.]\n\n\nERROR in (year-divisible-by-2-but-not-4) (:17:9)\nERROR in (year-divisible-by-2-but-not-4) (:17:9)\nexpected: (not (example-all-fail/leap-year? 1658))\nexpected: (not (example-all-fail/leap-year? 1658))\n actual: #object[Error Error: Cannot call false as a function.]\n actual: #object[Error Error: Cannot call false as a function.]\n\n\nERROR in (year-divisible-by-4-but-not-100) (:21:9)\nERROR in (year-divisible-by-4-but-not-100) (:21:9)\nexpected: (example-all-fail/leap-year? 2004)\nexpected: (example-all-fail/leap-year? 2004)\n actual: #object[Error Error: Cannot call true as a function.]\n actual: #object[Error Error: Cannot call true as a function.]\n\n\nERROR in (year-divisible-by-4-and-5) (:25:9)\nERROR in (year-divisible-by-4-and-5) (:25:9)\nexpected: (example-all-fail/leap-year? 2020)\nexpected: (example-all-fail/leap-year? 2020)\n actual: #object[Error Error: Cannot call true as a function.]\n actual: #object[Error Error: Cannot call true as a function.]\n\n\nERROR in (year-divisible-by-100-but-not-400) (:29:9)\nERROR in (year-divisible-by-100-but-not-400) (:29:9)\nexpected: (not (example-all-fail/leap-year? 2200))\nexpected: (not (example-all-fail/leap-year? 2200))\n actual: #object[Error Error: Cannot call false as a function.]\n actual: #object[Error Error: Cannot call false as a function.]\n\n\nERROR in (year-divisible-by-100-but-not-by-3) (:33:9)\nERROR in (year-divisible-by-100-but-not-by-3) (:33:9)\nexpected: (not (example-all-fail/leap-year? 2500))\nexpected: (not (example-all-fail/leap-year? 2500))\n actual: #object[Error Error: Cannot call false as a function.]\n actual: #object[Error Error: Cannot call false as a function.]\n\n\nERROR in (year-divisible-by-400) (:37:9)\nERROR in (year-divisible-by-400) (:37:9)\nexpected: (example-all-fail/leap-year? 2800)\nexpected: (example-all-fail/leap-year? 2800)\n actual: #object[Error Error: Cannot call true as a function.]\n actual: #object[Error Error: Cannot call true as a function.]\n\n\nERROR in (year-divisible-by-400-but-not-125) (:41:9)\nERROR in (year-divisible-by-400-but-not-125) (:41:9)\nexpected: (example-all-fail/leap-year? 3200)\nexpected: (example-all-fail/leap-year? 3200)\n actual: #object[Error Error: Cannot call true as a function.]\n actual: #object[Error Error: Cannot call true as a function.]\n\n\nERROR in (year-divisible-by-200-but-not-by-400) (:45:9)\nERROR in (year-divisible-by-200-but-not-by-400) (:45:9)\nexpected: (not (example-all-fail/leap-year? 2900))\nexpected: (not (example-all-fail/leap-year? 2900))\n actual: #object[Error Error: Cannot call false as a function.]\n actual: #object[Error Error: Cannot call false as a function.]\n\n\nRan 9 tests containing 9 assertions.\nRan 9 tests containing 9 assertions.\n0 failures, 9 errors.\n0 failures, 9 errors." + "message": "Testing example-all-fail-test\nTesting example-all-fail-test\n\n\nERROR in (year-not-divisible-by-4) (:13:9)\nERROR in (year-not-divisible-by-4) (:13:9)\nexpected: (not (example-all-fail/leap-year? 2999))\nexpected: (not (example-all-fail/leap-year? 2999))\n actual: #object[TypeError TypeError: ea.call is not a function]\n actual: #object[TypeError TypeError: ea.call is not a function]\n\n\nERROR in (year-divisible-by-2-but-not-4) (:17:9)\nERROR in (year-divisible-by-2-but-not-4) (:17:9)\nexpected: (not (example-all-fail/leap-year? 1658))\nexpected: (not (example-all-fail/leap-year? 1658))\n actual: #object[TypeError TypeError: ea.call is not a function]\n actual: #object[TypeError TypeError: ea.call is not a function]\n\n\nERROR in (year-divisible-by-4-but-not-100) (:21:9)\nERROR in (year-divisible-by-4-but-not-100) (:21:9)\nexpected: (example-all-fail/leap-year? 2004)\nexpected: (example-all-fail/leap-year? 2004)\n actual: #object[TypeError TypeError: ea.call is not a function]\n actual: #object[TypeError TypeError: ea.call is not a function]\n\n\nERROR in (year-divisible-by-4-and-5) (:25:9)\nERROR in (year-divisible-by-4-and-5) (:25:9)\nexpected: (example-all-fail/leap-year? 2020)\nexpected: (example-all-fail/leap-year? 2020)\n actual: #object[TypeError TypeError: ea.call is not a function]\n actual: #object[TypeError TypeError: ea.call is not a function]\n\n\nERROR in (year-divisible-by-100-but-not-400) (:29:9)\nERROR in (year-divisible-by-100-but-not-400) (:29:9)\nexpected: (not (example-all-fail/leap-year? 2200))\nexpected: (not (example-all-fail/leap-year? 2200))\n actual: #object[TypeError TypeError: ea.call is not a function]\n actual: #object[TypeError TypeError: ea.call is not a function]\n\n\nERROR in (year-divisible-by-100-but-not-by-3) (:33:9)\nERROR in (year-divisible-by-100-but-not-by-3) (:33:9)\nexpected: (not (example-all-fail/leap-year? 2500))\nexpected: (not (example-all-fail/leap-year? 2500))\n actual: #object[TypeError TypeError: ea.call is not a function]\n actual: #object[TypeError TypeError: ea.call is not a function]\n\n\nERROR in (year-divisible-by-400) (:37:9)\nERROR in (year-divisible-by-400) (:37:9)\nexpected: (example-all-fail/leap-year? 2800)\nexpected: (example-all-fail/leap-year? 2800)\n actual: #object[TypeError TypeError: ea.call is not a function]\n actual: #object[TypeError TypeError: ea.call is not a function]\n\n\nERROR in (year-divisible-by-400-but-not-125) (:41:9)\nERROR in (year-divisible-by-400-but-not-125) (:41:9)\nexpected: (example-all-fail/leap-year? 3200)\nexpected: (example-all-fail/leap-year? 3200)\n actual: #object[TypeError TypeError: ea.call is not a function]\n actual: #object[TypeError TypeError: ea.call is not a function]\n\n\nERROR in (year-divisible-by-200-but-not-by-400) (:45:9)\nERROR in (year-divisible-by-200-but-not-by-400) (:45:9)\nexpected: (not (example-all-fail/leap-year? 2900))\nexpected: (not (example-all-fail/leap-year? 2900))\n actual: #object[TypeError TypeError: ea.call is not a function]\n actual: #object[TypeError TypeError: ea.call is not a function]\n\n\nRan 9 tests containing 9 assertions.\nRan 9 tests containing 9 assertions.\n0 failures, 9 errors.\n0 failures, 9 errors." } diff --git a/tests/example-empty-file/deps.edn b/tests/example-empty-file/deps.edn index 5c65da5..9554aae 100644 --- a/tests/example-empty-file/deps.edn +++ b/tests/example-empty-file/deps.edn @@ -1,6 +1,6 @@ {:deps - {org.clojure/clojure {:mvn/version "1.10.1"} - org.clojure/clojurescript {:mvn/version "1.10.773"}} + {org.clojure/clojure {:mvn/version "1.11.1"} + org.clojure/clojurescript {:mvn/version "1.11.60"}} :aliases {:test diff --git a/tests/example-empty-file/expected_results.json b/tests/example-empty-file/expected_results.json index 4ef9a34..45b05d4 100644 --- a/tests/example-empty-file/expected_results.json +++ b/tests/example-empty-file/expected_results.json @@ -1,5 +1,5 @@ { "version": 1, "status": "fail", - "message": "Message: Could not find namespace: example-empty-file\nMessage: Could not find namespace: example-empty-file" + "message": "Message: Could not find namespace: example-empty-file\nMessage: Could not find namespace: example-empty-file\nCould not find namespace: example-empty-file\nCould not find namespace: example-empty-file" } diff --git a/tests/example-partial-fail/deps.edn b/tests/example-partial-fail/deps.edn index 5c65da5..9554aae 100644 --- a/tests/example-partial-fail/deps.edn +++ b/tests/example-partial-fail/deps.edn @@ -1,6 +1,6 @@ {:deps - {org.clojure/clojure {:mvn/version "1.10.1"} - org.clojure/clojurescript {:mvn/version "1.10.773"}} + {org.clojure/clojure {:mvn/version "1.11.1"} + org.clojure/clojurescript {:mvn/version "1.11.60"}} :aliases {:test diff --git a/tests/example-success/deps.edn b/tests/example-success/deps.edn index 5c65da5..9554aae 100644 --- a/tests/example-success/deps.edn +++ b/tests/example-success/deps.edn @@ -1,6 +1,6 @@ {:deps - {org.clojure/clojure {:mvn/version "1.10.1"} - org.clojure/clojurescript {:mvn/version "1.10.773"}} + {org.clojure/clojure {:mvn/version "1.11.1"} + org.clojure/clojurescript {:mvn/version "1.11.60"}} :aliases {:test diff --git a/tests/example-syntax-error/deps.edn b/tests/example-syntax-error/deps.edn index 5c65da5..9554aae 100644 --- a/tests/example-syntax-error/deps.edn +++ b/tests/example-syntax-error/deps.edn @@ -1,6 +1,6 @@ {:deps - {org.clojure/clojure {:mvn/version "1.10.1"} - org.clojure/clojurescript {:mvn/version "1.10.773"}} + {org.clojure/clojure {:mvn/version "1.11.1"} + org.clojure/clojurescript {:mvn/version "1.11.60"}} :aliases {:test diff --git a/tests/example-syntax-error/expected_results.json b/tests/example-syntax-error/expected_results.json index 0144cc5..d69b8e2 100644 --- a/tests/example-syntax-error/expected_results.json +++ b/tests/example-syntax-error/expected_results.json @@ -1,5 +1,5 @@ { "version": 1, "status": "fail", - "message": "Message: Could not resolve symbol: leap\nMessage: Could not resolve symbol: leap\nLocation: 1:14\nLocation: 1:14\nPhase: analysis" + "message": "Message: EOF while reading, expected ) to match ( at [1,1]\nMessage: EOF while reading, expected ) to match ( at [1,1]\nLocation: 39:226\nLocation: 39:226\nPhase: parse" }