From bdbe16a685160a6047cc5a8bb37e2b4bcbf6a546 Mon Sep 17 00:00:00 2001 From: Vale Date: Wed, 30 Oct 2019 00:09:51 +0900 Subject: [PATCH 01/10] Temporarily disable build-docs Doesn't work on forked repos --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1c9d14d2..821c6add 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,8 +105,8 @@ workflows: jobs: - test-clj - test-cljs - - build-docs: - filters: - branches: - only: - - master + # - build-docs: + # filters: + # branches: + # only: + # - master From c3650cf5392d7521dd8d5d32bbe1c6c2e05bd4ec Mon Sep 17 00:00:00 2001 From: Vale Date: Wed, 30 Oct 2019 00:10:13 +0900 Subject: [PATCH 02/10] Build against multiple JDKs --- .circleci/config.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 821c6add..4a0b8900 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,8 +2,11 @@ version: 2 jobs: test-clj: working_directory: ~/test + parameters: + image: + type: string docker: - - image: clojure:lein-2.7.1 + - image: << parameters.image >> steps: - checkout - restore_cache: @@ -103,7 +106,14 @@ workflows: version: 2 test-and-build-docs: jobs: - - test-clj + - test-clj: + image: clojure:openjdk-8-lein-2.9.1 + - test-clj: + image: clojure:openjdk-11-lein-2.9.1 + - test-clj: + image: clojure:openjdk-13-lein-2.9.1 + - test-clj: + image: clojure:openjdk-14-lein-2.9.1 - test-cljs # - build-docs: # filters: From 590d8116192b7df421699be6cfc074e9cadf1f3a Mon Sep 17 00:00:00 2001 From: Vale Date: Wed, 30 Oct 2019 00:13:12 +0900 Subject: [PATCH 03/10] "image" is a disallowed key --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4a0b8900..97e8e6ea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,10 +3,10 @@ jobs: test-clj: working_directory: ~/test parameters: - image: + image-name: type: string docker: - - image: << parameters.image >> + - image: << parameters.image-name >> steps: - checkout - restore_cache: @@ -107,13 +107,13 @@ workflows: test-and-build-docs: jobs: - test-clj: - image: clojure:openjdk-8-lein-2.9.1 + image-name: clojure:openjdk-8-lein-2.9.1 - test-clj: - image: clojure:openjdk-11-lein-2.9.1 + image-name: clojure:openjdk-11-lein-2.9.1 - test-clj: - image: clojure:openjdk-13-lein-2.9.1 + image-name: clojure:openjdk-13-lein-2.9.1 - test-clj: - image: clojure:openjdk-14-lein-2.9.1 + image-name: clojure:openjdk-14-lein-2.9.1 - test-cljs # - build-docs: # filters: From 41f880fb0c109241639dab0baab5782881b13abe Mon Sep 17 00:00:00 2001 From: Vale Date: Wed, 30 Oct 2019 00:15:11 +0900 Subject: [PATCH 04/10] Use version 2.1 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 97e8e6ea..93b81c7c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,4 @@ -version: 2 +version: 2.1 jobs: test-clj: working_directory: ~/test From f7a4e89e7b4c090f1e3ea2e9de8d74cfda383a77 Mon Sep 17 00:00:00 2001 From: Vale Date: Wed, 30 Oct 2019 00:26:46 +0900 Subject: [PATCH 05/10] Use CircleCI images for curl --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 93b81c7c..789c5a2d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,13 +107,13 @@ workflows: test-and-build-docs: jobs: - test-clj: - image-name: clojure:openjdk-8-lein-2.9.1 + image-name: circleci/clojure:openjdk-8-lein - test-clj: - image-name: clojure:openjdk-11-lein-2.9.1 + image-name: circleci/clojure:openjdk-11-lein - test-clj: - image-name: clojure:openjdk-13-lein-2.9.1 + image-name: circleci/clojure:openjdk-13-lein - test-clj: - image-name: clojure:openjdk-14-lein-2.9.1 + image-name: circleci/clojure:openjdk-14-lein - test-cljs # - build-docs: # filters: From 59ea24f48bf536b435c26b3aeef727861599b323 Mon Sep 17 00:00:00 2001 From: Vale Date: Wed, 30 Oct 2019 00:38:51 +0900 Subject: [PATCH 06/10] Add curl if missing --- .circleci/config.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 789c5a2d..2e1927f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,6 +20,9 @@ jobs: - run: name: Run tests command: ./scripts/test.sh clj + - run: + name: Install curl if missing + command: apt update && apt install -y curl - run: name: Verify cljdoc.edn command: curl -fsSL https://raw.githubusercontent.com/cljdoc/cljdoc/master/script/verify-cljdoc-edn | bash -s doc/cljdoc.edn @@ -107,13 +110,13 @@ workflows: test-and-build-docs: jobs: - test-clj: - image-name: circleci/clojure:openjdk-8-lein + image-name: clojure:openjdk-8-lein-2.9.1 - test-clj: - image-name: circleci/clojure:openjdk-11-lein + image-name: clojure:openjdk-11-lein-2.9.1 - test-clj: - image-name: circleci/clojure:openjdk-13-lein + image-name: clojure:openjdk-13-lein-2.9.1 - test-clj: - image-name: circleci/clojure:openjdk-14-lein + image-name: clojure:openjdk-14-lein-2.9.1 - test-cljs # - build-docs: # filters: From eb31c04fd67247e669c8ce6743ee85a394dd6402 Mon Sep 17 00:00:00 2001 From: Vale Date: Wed, 30 Oct 2019 00:42:03 +0900 Subject: [PATCH 07/10] Name builds properly --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e1927f4..7f24d32a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -109,13 +109,13 @@ workflows: version: 2 test-and-build-docs: jobs: - - test-clj: + - test-clj-jdk8: image-name: clojure:openjdk-8-lein-2.9.1 - - test-clj: + - test-clj-jdk11: image-name: clojure:openjdk-11-lein-2.9.1 - - test-clj: + - test-clj-jdk13: image-name: clojure:openjdk-13-lein-2.9.1 - - test-clj: + - test-clj-jdk14: image-name: clojure:openjdk-14-lein-2.9.1 - test-cljs # - build-docs: From c1991badb2b7f7026265701f030eeab1cc4df22d Mon Sep 17 00:00:00 2001 From: Vale Date: Wed, 30 Oct 2019 00:42:51 +0900 Subject: [PATCH 08/10] Enable build-docs again --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f24d32a..469d73e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -118,8 +118,8 @@ workflows: - test-clj-jdk14: image-name: clojure:openjdk-14-lein-2.9.1 - test-cljs - # - build-docs: - # filters: - # branches: - # only: - # - master + - build-docs: + filters: + branches: + only: + - master From 216bba6c473c4e3fac7c184dfd752d42dfe67556 Mon Sep 17 00:00:00 2001 From: Vale Date: Wed, 30 Oct 2019 00:42:03 +0900 Subject: [PATCH 09/10] Revert "Name builds properly" This reverts commit eb31c04fd67247e669c8ce6743ee85a394dd6402. --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 469d73e0..9acc648b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -109,13 +109,13 @@ workflows: version: 2 test-and-build-docs: jobs: - - test-clj-jdk8: + - test-clj: image-name: clojure:openjdk-8-lein-2.9.1 - - test-clj-jdk11: + - test-clj: image-name: clojure:openjdk-11-lein-2.9.1 - - test-clj-jdk13: + - test-clj: image-name: clojure:openjdk-13-lein-2.9.1 - - test-clj-jdk14: + - test-clj: image-name: clojure:openjdk-14-lein-2.9.1 - test-cljs - build-docs: From 92c7fe8e3ca46a66368755707a33e239765d0ae2 Mon Sep 17 00:00:00 2001 From: Vale Date: Wed, 30 Oct 2019 01:24:34 +0900 Subject: [PATCH 10/10] Explicitly name stages --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9acc648b..6244a08e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -110,12 +110,16 @@ workflows: test-and-build-docs: jobs: - test-clj: + name: jdk8 image-name: clojure:openjdk-8-lein-2.9.1 - test-clj: + name: jdk11 image-name: clojure:openjdk-11-lein-2.9.1 - test-clj: + name: jdk13 image-name: clojure:openjdk-13-lein-2.9.1 - test-clj: + name: jdk14 image-name: clojure:openjdk-14-lein-2.9.1 - test-cljs - build-docs: