rollback previous CI executors

ArtyomGabeev · Sep 9, 2024 · 9ddc77e · 9ddc77e
1 parent da232cc
commit 9ddc77e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 0 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,6 +8,20 @@ executors:
     resource_class: medium+
     docker:
       - image: cimg/openjdk:21.0.2
+  circle-jdk17-executor:
+    working_directory: ~/micrometer
+    environment:
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+    resource_class: medium+
+    docker:
+      - image: cimg/openjdk:17.0.11
+  circle-jdk11-executor:
+    working_directory: ~/micrometer
+    environment:
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+    resource_class: medium+
+    docker:
+      - image: cimg/openjdk:11.0.22
   machine-executor:
     working_directory: ~/micrometer
     machine:
@@ -54,6 +68,16 @@ jobs:
       - run: ./gradlew zgcTest
       - run: ./gradlew zgcGenerationalTest
 
+  build-jdk11:
+    executor: circle-jdk11-executor
+    steps:
+      - gradlew-build
+
+  build-jdk17:
+    executor: circle-jdk17-executor
+    steps:
+      - gradlew-build
+
   docker-tests:
     executor: machine-executor
     steps:
@@ -75,10 +99,14 @@ workflows:
   build_prs_deploy_snapshots:
     jobs:
       - build
+      - build-jdk11
+      - build-jdk17
       - docker-tests
       - deploy:
           requires:
             - build
+            - build-jdk11
+            - build-jdk17
             - docker-tests
           filters:
             branches:
@@ -93,6 +121,18 @@ workflows:
               ignore: /.*/
             tags:
               only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
+      - build-jdk11:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
+      - build-jdk17:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
       - docker-tests:
           filters:
             branches:
@@ -102,6 +142,8 @@ workflows:
       - deploy:
           requires:
             - build
+            - build-jdk11
+            - build-jdk17
             - docker-tests
           filters:
             tags:

diff --git a/micrometer-java21/build.gradle b/micrometer-java21/build.gradle
@@ -1,5 +1,10 @@
 description 'Micrometer core classes that require Java 21'
 
+// skip this module when building with jdk <21
+if (!javaLanguageVersion.canCompileOrRun(21)) {
+    project.tasks.configureEach { task -> task.enabled = false }
+}
+
 dependencies {
     api project(":micrometer-core")