From 3897954797469909e54f300f08bcbdae40c210c5 Mon Sep 17 00:00:00 2001 From: livk Date: Mon, 2 Dec 2024 16:50:43 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcircleci=E6=B2=A1?= =?UTF-8?q?=E6=9C=89docker=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 07a82746b..73a6bf516 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,6 +8,8 @@ jobs: environment: JVM_OPTS: -Xmx3200m TERM: dumb + architecture: "amd64" + platform: "linux/amd64" steps: - checkout @@ -20,6 +22,8 @@ jobs: environment: JVM_OPTS: -Xmx3200m TERM: dumb + architecture: "amd64" + platform: "linux/amd64" steps: - checkout @@ -32,6 +36,8 @@ jobs: environment: JVM_OPTS: -Xmx3200m TERM: dumb + architecture: "amd64" + platform: "linux/amd64" steps: - checkout From fdbc3fc3600894df01372149f9e1cd785d689d89 Mon Sep 17 00:00:00 2001 From: livk Date: Mon, 2 Dec 2024 16:59:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcircleci=E6=B2=A1?= =?UTF-8?q?=E6=9C=89docker=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 73a6bf516..7aa24c2e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,12 +8,16 @@ jobs: environment: JVM_OPTS: -Xmx3200m TERM: dumb - architecture: "amd64" - platform: "linux/amd64" steps: - checkout - - run: ./gradlew build + - run: + name: Start Docker + command: | + sudo service docker start + - run: + name: Run Tests with Testcontainers + command: ./gradlew build jdk22-ci: docker: @@ -22,12 +26,16 @@ jobs: environment: JVM_OPTS: -Xmx3200m TERM: dumb - architecture: "amd64" - platform: "linux/amd64" steps: - checkout - - run: ./gradlew build + - run: + name: Start Docker + command: | + sudo service docker start + - run: + name: Run Tests with Testcontainers + command: ./gradlew build jdk23-ci: docker: @@ -36,12 +44,16 @@ jobs: environment: JVM_OPTS: -Xmx3200m TERM: dumb - architecture: "amd64" - platform: "linux/amd64" steps: - checkout - - run: ./gradlew build + - run: + name: Start Docker + command: | + sudo service docker start + - run: + name: Run Tests with Testcontainers + command: ./gradlew build workflows: gradle-build: From 5394f72c0344592f8e692e6f5a8afec0f64f5479 Mon Sep 17 00:00:00 2001 From: livk Date: Mon, 2 Dec 2024 17:10:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcircleci=E6=B2=A1?= =?UTF-8?q?=E6=9C=89docker=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 58 +++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7aa24c2e5..30d2720c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,63 +1,49 @@ version: 2.1 -jobs: - jdk21-ci: +orbs: + tcc: atomicjar/testcontainers-cloud-orb@0.1.0 + +executors: + jdk21: docker: - image: cimg/openjdk:21.0.5 - environment: JVM_OPTS: -Xmx3200m TERM: dumb - steps: - checkout - - run: - name: Start Docker - command: | - sudo service docker start - - run: - name: Run Tests with Testcontainers - command: ./gradlew build - - jdk22-ci: + jdk22: docker: - image: cimg/openjdk:22.0.2 - environment: JVM_OPTS: -Xmx3200m TERM: dumb - steps: - checkout - - run: - name: Start Docker - command: | - sudo service docker start - - run: - name: Run Tests with Testcontainers - command: ./gradlew build - - jdk23-ci: + jdk23: docker: - image: cimg/openjdk:23.0.1 - environment: JVM_OPTS: -Xmx3200m TERM: dumb - steps: - checkout - - run: - name: Start Docker - command: | - sudo service docker start - - run: - name: Run Tests with Testcontainers - command: ./gradlew build workflows: gradle-build: jobs: - - jdk21-ci - - jdk22-ci - - jdk23-ci + - jdk21-ci: + command: ./gradlew build + executor: jdk21 + pre-steps: + - tcc/setup + - jdk22-ci: + command: ./gradlew build + executor: jdk22 + pre-steps: + - tcc/setup + - jdk23-ci: + command: ./gradlew build + executor: jdk23 + pre-steps: + - tcc/setup From 540a50956b5994004670f1b003867a6227e3cf9c Mon Sep 17 00:00:00 2001 From: livk Date: Mon, 2 Dec 2024 17:12:39 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcircleci=E6=B2=A1?= =?UTF-8?q?=E6=9C=89docker=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30d2720c4..ea27b21ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,39 +10,36 @@ executors: environment: JVM_OPTS: -Xmx3200m TERM: dumb - steps: - - checkout jdk22: docker: - image: cimg/openjdk:22.0.2 environment: JVM_OPTS: -Xmx3200m TERM: dumb - steps: - - checkout jdk23: docker: - image: cimg/openjdk:23.0.1 environment: JVM_OPTS: -Xmx3200m TERM: dumb - steps: - - checkout workflows: gradle-build: jobs: - jdk21-ci: + steps: checkout command: ./gradlew build executor: jdk21 pre-steps: - tcc/setup - jdk22-ci: + steps: checkout command: ./gradlew build executor: jdk22 pre-steps: - tcc/setup - jdk23-ci: + steps: checkout command: ./gradlew build executor: jdk23 pre-steps: From bfd28bb496516993ad3e0c8b01f6a88051609002 Mon Sep 17 00:00:00 2001 From: livk Date: Mon, 2 Dec 2024 17:20:47 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcircleci=E6=B2=A1?= =?UTF-8?q?=E6=9C=89docker=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ea27b21ef..3bbb738dc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,24 +23,32 @@ executors: JVM_OPTS: -Xmx3200m TERM: dumb +jobs: + jdk21-ci: + executor: jdk21 + steps: + - checkout + - run: ./gradlew build + jdk22-ci: + executor: jdk22 + steps: + - checkout + - run: ./gradlew build + jdk23-ci: + executor: jdk23 + steps: + - checkout + - run: ./gradlew build + workflows: gradle-build: jobs: - jdk21-ci: - steps: checkout - command: ./gradlew build - executor: jdk21 pre-steps: - tcc/setup - jdk22-ci: - steps: checkout - command: ./gradlew build - executor: jdk22 pre-steps: - tcc/setup - jdk23-ci: - steps: checkout - command: ./gradlew build - executor: jdk23 pre-steps: - tcc/setup From c678219252d73cf5093711230bf641653597502b Mon Sep 17 00:00:00 2001 From: livk Date: Mon, 2 Dec 2024 17:44:58 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcircleci=E6=B2=A1?= =?UTF-8?q?=E6=9C=89docker=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3bbb738dc..de2904313 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,54 +1,54 @@ version: 2.1 -orbs: - tcc: atomicjar/testcontainers-cloud-orb@0.1.0 - executors: jdk21: - docker: - - image: cimg/openjdk:21.0.5 environment: JVM_OPTS: -Xmx3200m TERM: dumb + machine: + image: ubuntu-2004:202104-01 + docker_layer_caching: true jdk22: - docker: - - image: cimg/openjdk:22.0.2 environment: JVM_OPTS: -Xmx3200m TERM: dumb + machine: + image: ubuntu-2004:202104-01 + docker_layer_caching: true jdk23: - docker: - - image: cimg/openjdk:23.0.1 environment: JVM_OPTS: -Xmx3200m TERM: dumb + machine: + image: ubuntu-2004:202104-01 + docker_layer_caching: true jobs: jdk21-ci: executor: jdk21 steps: + - run: sudo apt-get update + - run: sudo apt-get install -y openjdk-21-jdk - checkout - run: ./gradlew build jdk22-ci: executor: jdk22 steps: + - run: sudo apt-get update + - run: sudo apt-get install -y openjdk-22-jdk - checkout - run: ./gradlew build jdk23-ci: executor: jdk23 steps: + - run: sudo apt-get update + - run: sudo apt-get install -y openjdk-23-jdk - checkout - run: ./gradlew build workflows: gradle-build: jobs: - - jdk21-ci: - pre-steps: - - tcc/setup - - jdk22-ci: - pre-steps: - - tcc/setup - - jdk23-ci: - pre-steps: - - tcc/setup + - jdk21-ci + - jdk22-ci + - jdk23-ci From ef310fef20277415bd1198b18fad857326d22036 Mon Sep 17 00:00:00 2001 From: livk Date: Mon, 2 Dec 2024 17:47:45 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcircleci=E6=B2=A1?= =?UTF-8?q?=E6=9C=89docker=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index de2904313..aaa057de2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,22 +6,25 @@ executors: JVM_OPTS: -Xmx3200m TERM: dumb machine: - image: ubuntu-2004:202104-01 + image: ubuntu-2204:2024.11.1 docker_layer_caching: true + resource_class: arm.medium jdk22: environment: JVM_OPTS: -Xmx3200m TERM: dumb machine: - image: ubuntu-2004:202104-01 + image: ubuntu-2204:2024.11.1 docker_layer_caching: true + resource_class: arm.medium jdk23: environment: JVM_OPTS: -Xmx3200m TERM: dumb machine: - image: ubuntu-2004:202104-01 + image: ubuntu-2204:2024.11.1 docker_layer_caching: true + resource_class: arm.medium jobs: jdk21-ci: