diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index f58b0a3..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,35 +0,0 @@ -version: 2.1 - -jobs: - test: - parameters: - docker-image: - type: string - clj-version: - type: string - default: "1.11" - working_directory: ~/project - docker: - - image: << parameters.docker-image >> - steps: - - checkout - - restore_cache: - key: project-{{ checksum "deps.edn" }} - - run: clojure -T:build test :clj '"<< parameters.clj-version >>"' - - save_cache: - paths: - - ~/.m2 - key: project-{{ checksum "deps.edn" }} - -workflows: - test_all_jdks: - jobs: - - test: - matrix: - parameters: - docker-image: - - clojure:temurin-8-jammy - - clojure:temurin-11-jammy - - clojure:temurin-17-jammy - - clojure:temurin-21-jammy - clj-version: ["1.10", "1.11", "1.12"] diff --git a/.github/workflows/test-all-jdks.yaml b/.github/workflows/test-all-jdks.yaml new file mode 100644 index 0000000..c0d9420 --- /dev/null +++ b/.github/workflows/test-all-jdks.yaml @@ -0,0 +1,34 @@ +name: "Test All JDKs" +on: + pull_request: +jobs: + test: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + docker-image: + - clojure:temurin-8-jammy + - clojure:temurin-11-jammy + - clojure:temurin-17-jammy + - clojure:temurin-21-jammy + clj-version: ["1.10", "1.11", "1.12"] + container: ${{ matrix.docker-image }} + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Restore Cache + uses: actions/cache/restore@v4 + with: + path: /root/.m2 # Explicit path inside the container to overcome GitHub Actions bug https://github.com/actions/runner/issues/1876 + key: ${{ matrix.docker-image }}-${{ matrix.clj-version }}-${{ hashFiles('deps.edn') }} + + - name: Run Test + run: clojure -T:build test :clj '"${{ matrix.clj-version }}"' + + - name: Save Cache + uses: actions/cache/save@v4 + with: + path: /root/.m2 + key: ${{ matrix.docker-image }}-${{ matrix.clj-version }}-${{ hashFiles('deps.edn') }} diff --git a/build.clj b/build.clj index e847bd1..f9ef95b 100644 --- a/build.clj +++ b/build.clj @@ -31,7 +31,7 @@ (defn test "Run all the tests." [opts] (bb/clean opts) (bb/run-tests (cond-> (assoc opts :aliases [:ssm]) - (:clj opts) (update :aliases into (:clj opts)))) + (:clj opts) (update :aliases conj (:clj opts)))) opts) (defn- build-jar [opts extra-aliases include-str]