From 8ec08ca686aed3ccd0b400e3fa484a353dae1a38 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Mon, 21 Jun 2021 15:16:18 -0700 Subject: [PATCH] Addresses #331 by changing some CI stuff * Updated Eastwood to 0.5.1 * Added set -Eeo pipefail to run-tests.sh (I don't like -x) * Run CI on PR * Add shellcheck to steps I'm not going to run Eastwood on tests at this point (see my comments in #334 for reasons). --- .github/workflows/test.yml | 4 +++- deps.edn | 2 +- run-tests.sh | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 24c1507..78bef8e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: Clojure CI -on: [push] +on: [push, pull_request] jobs: build: @@ -18,6 +18,8 @@ jobs: uses: DeLaGuardo/setup-clojure@master with: tools-deps: '1.10.3.839' + - name: Lint test script + run: shellcheck run-tests.sh - name: Run Tests run: sh run-tests.sh all - name: Check cljdoc.edn diff --git a/deps.edn b/deps.edn index 87a810d..c65a077 100644 --- a/deps.edn +++ b/deps.edn @@ -15,7 +15,7 @@ :main-opts ["-m" "cljs-test-runner.main"]} :readme {:extra-deps {seancorfield/readme {:mvn/version "1.0.16"}} :main-opts ["-m" "seancorfield.readme"]} - :eastwood {:extra-deps {jonase/eastwood {:mvn/version "0.4.2"}} + :eastwood {:extra-deps {jonase/eastwood {:mvn/version "0.5.1"}} :main-opts ["-m" "eastwood.lint" "{:source-paths,[\"src\"]}"]} :jar {:replace-deps {com.github.seancorfield/depstar {:mvn/version "2.0.216"}} :exec-fn hf.depstar/jar diff --git a/run-tests.sh b/run-tests.sh index 10606cf..9a12540 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -Eeo pipefail echo ==== Test README.md ==== && clojure -M:readme && \ echo ==== Lint Source ==== && clojure -M:eastwood && \