From 0c1b289cc03915547d85e5fb253cfbe33f401612 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Thu, 8 Jun 2023 14:39:33 -0700 Subject: [PATCH 1/6] Add branch + config.yml to the circleci cache key Closes gh-273 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d25f411..32fc2702 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,12 +40,12 @@ commands: steps: - checkout - restore_cache: - key: gradle-dependencies-{{ checksum "build.gradle" }} + key: gradle-dependencies-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }} - run: name: downloadDependencies command: ./gradlew downloadDependencies --console=plain - save_cache: - key: gradle-dependencies-{{ checksum "build.gradle" }} + key: gradle-dependencies-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }} paths: - ~/.gradle - run: @@ -94,7 +94,7 @@ jobs: steps: - checkout - restore_cache: - key: gradle-dependencies-{{ checksum "build.gradle" }} + key: gradle-dependencies-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum ".circleci/config.yml" }} - deploy: name: Deployment command: sh ./gradle/deploy.sh From 80972eb8814a90a486a21732a0df4287ea8b3c26 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Thu, 8 Jun 2023 14:40:34 -0700 Subject: [PATCH 2/6] Upgrade machine executor to ubuntu-2204:2023.04.2 Closes gh-274 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 32fc2702..31500425 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ executors: machine-executor: working_directory: ~/micrometer-tracing machine: - image: ubuntu-2204:2023.02.1 + image: ubuntu-2204:2023.04.2 commands: gradlew-build: From 082804eed441af1ac5c22ed9ee587d5f5081b9f4 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Thu, 8 Jun 2023 14:41:19 -0700 Subject: [PATCH 3/6] Build with Java 20 instead of 19 Closes gh-275 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 31500425..1c71208e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ executors: environment: GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' docker: - - image: cimg/openjdk:19.0.1 + - image: cimg/openjdk:20.0.1 circle-jdk8-executor: working_directory: ~/micrometer-tracing environment: From 60d05f2baa8a3abd8a59dc5dba1aa835e6b3528b Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Thu, 8 Jun 2023 14:41:53 -0700 Subject: [PATCH 4/6] Build with Java 17.0.7 instead of 17.0.6 Closes gh-276 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1c71208e..601b35d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ executors: environment: GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' docker: - - image: cimg/openjdk:17.0.6 + - image: cimg/openjdk:17.0.7 machine-executor: working_directory: ~/micrometer-tracing machine: From 096fd3133dbacc72c536ddbe60be8e24f77a8a6f Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Thu, 8 Jun 2023 14:42:24 -0700 Subject: [PATCH 5/6] Build with Java 11.0.19 instead of 11.0.18 Closes gh-277 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 601b35d7..00400941 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ executors: environment: GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' docker: - - image: cimg/openjdk:11.0.18 + - image: cimg/openjdk:11.0.19 circle-jdk17-executor: working_directory: ~/micrometer-tracing environment: From 411dcf55f34f39266d604824caf9dd437ec37fba Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Thu, 8 Jun 2023 14:43:53 -0700 Subject: [PATCH 6/6] Remove JDK8 build job Closes gh-278 --- .circleci/config.yml | 20 -------------------- CONTRIBUTING.md | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00400941..25b6fd3c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,12 +7,6 @@ executors: GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' docker: - image: cimg/openjdk:20.0.1 - circle-jdk8-executor: - working_directory: ~/micrometer-tracing - environment: - GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' - docker: - - image: cimg/openjdk:8.0.362 circle-jdk11-executor: working_directory: ~/micrometer-tracing environment: @@ -68,11 +62,6 @@ jobs: steps: - gradlew-build - build-jdk8: - executor: circle-jdk8-executor - steps: - - gradlew-build - build-jdk11: executor: circle-jdk11-executor steps: @@ -104,14 +93,12 @@ workflows: build_prs_deploy_snapshots: jobs: - build - - build-jdk8 - build-jdk11 - build-jdk17 - docker-tests - deploy: requires: - build - - build-jdk8 - build-jdk11 - build-jdk17 - docker-tests @@ -128,12 +115,6 @@ workflows: ignore: /.*/ tags: only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/ - - build-jdk8: - filters: - branches: - ignore: /.*/ - tags: - only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/ - build-jdk11: filters: branches: @@ -155,7 +136,6 @@ workflows: - deploy: requires: - build - - build-jdk8 - build-jdk11 - build-jdk17 - docker-tests diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 18dd09f7..f17fabfd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,7 +36,7 @@ Git client to clone the source code to your local machine. ## Building -Micrometer requires JDK 8 or later to build. +Micrometer Tracing targets Java 8 but requires JDK 11 or later to build. The Gradle wrapper is provided and should be used for building with a consistent version of Gradle.