From 84b69ae0e382cacdb8fcb525ec44db3f606d9a97 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 14:38:46 +0700 Subject: [PATCH 01/17] feat: add amd image --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9ac6590..dba706e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,8 @@ jobs: tests-unit: working_directory: ~/repo docker: - - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" +# - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" + - image: &default-dotnet-image "mcr.microsoft.com/dotnet/aspnet:8.0.19-jammy-amd64" steps: - checkout - client-test: From f8200c447dabe1d63de7902c518924339cf4a6d0 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 14:46:28 +0700 Subject: [PATCH 02/17] feat: add amd image --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dba706e..2af75bb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,7 +51,8 @@ jobs: working_directory: ~/repo docker: # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" - - image: &default-dotnet-image "mcr.microsoft.com/dotnet/aspnet:8.0.19-jammy-amd64" + - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-amd64" +# - image: &default-dotnet-image "mcr.microsoft.com/dotnet/aspnet:8.0.19-jammy-amd64" steps: - checkout - client-test: From 7190e185b11c8cf41457654a4ba785846016d3b3 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 14:50:33 +0700 Subject: [PATCH 03/17] feat: add amd image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2af75bb..6caf93e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,7 +51,7 @@ jobs: working_directory: ~/repo docker: # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" - - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-amd64" + - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy" # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/aspnet:8.0.19-jammy-amd64" steps: - checkout From 5e219df4f1f4135a6d8a729e2b816685912c2ec8 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 14:57:21 +0700 Subject: [PATCH 04/17] feat: add amd image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6caf93e..c9e51fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,7 +51,7 @@ jobs: working_directory: ~/repo docker: # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" - - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy" + - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-amd64" # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/aspnet:8.0.19-jammy-amd64" steps: - checkout From a641415e1e29c30e0c1b3b4eda359dd417c81258 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 15:01:37 +0700 Subject: [PATCH 05/17] feat: add amd image --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c9e51fa..c2a6031 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,7 +51,8 @@ jobs: working_directory: ~/repo docker: # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" - - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-amd64" +# - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-amd64" + - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64" # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/aspnet:8.0.19-jammy-amd64" steps: - checkout From 02d55e129770e6d14c837837bce6c36794bb485f Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 15:10:16 +0700 Subject: [PATCH 06/17] feat: add amd image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2a6031..e94277d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,7 +52,7 @@ jobs: docker: # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-amd64" - - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64" + - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8" # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/aspnet:8.0.19-jammy-amd64" steps: - checkout From b76a50f6732a24afb841f27ba14df84cf865d355 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 15:18:23 +0700 Subject: [PATCH 07/17] feat: add amd image --- .circleci/config.yml | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e94277d..1e8f917 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,5 @@ version: 2.1 + commands: client-test: parameters: @@ -45,6 +46,32 @@ commands: - store_test_results: path: test-results +executors: + docker-amd64-image: + parameters: + dotnet-image: + type: string + default: << pipeline.parameters.default-dotnet-image >> + docker: + - image: <> + - image: influxdb:3-core + environment: + - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 + - INFLUXDB3_OBJECT_STORE=file + - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data + docker-arm64-image: + parameters: + dotnet-image: + type: string + default: << pipeline.parameters.default-dotnet-image >> + docker: + - image: <> + - image: influxdb:3-core + environment: + - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 + - INFLUXDB3_OBJECT_STORE=file + - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data + resource_class: arm.medium jobs: tests-unit: @@ -52,8 +79,7 @@ jobs: docker: # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" # - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-amd64" - - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8" -# - image: &default-dotnet-image "mcr.microsoft.com/dotnet/aspnet:8.0.19-jammy-amd64" + - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8 steps: - checkout - client-test: From bd5130d7d820605d99e96cc75ed4cf37fa5e141e Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 15:26:29 +0700 Subject: [PATCH 08/17] feat: add amd image --- .circleci/config.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e8f917..39fed77 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,10 +76,13 @@ executors: jobs: tests-unit: working_directory: ~/repo + parameters: + dotnet-image: + type: string + default: mcr.microsoft.com/dotnet/sdk:8.0 docker: -# - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" -# - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-amd64" - - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8 + - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" +# - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8" steps: - checkout - client-test: @@ -145,6 +148,9 @@ workflows: jobs: - check-compilation-warnings - tests-unit + - tests-unit: + parameters: + dotnet-image: mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8 - tests-integration: requires: - "tests-unit" From 58bf9e4d990139c43fb24f90a5341c2430e45fd6 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 15:34:43 +0700 Subject: [PATCH 09/17] feat: add amd image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 39fed77..1bdfb1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -150,7 +150,7 @@ workflows: - tests-unit - tests-unit: parameters: - dotnet-image: mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8 + dotnet-image: mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8m - tests-integration: requires: - "tests-unit" From 1d9974c9d4d5ed9556dd6d13d152a26d3856f3d2 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 15:38:35 +0700 Subject: [PATCH 10/17] feat: add amd image --- .circleci/config.yml | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1bdfb1a..b6bead6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,32 +46,32 @@ commands: - store_test_results: path: test-results -executors: - docker-amd64-image: - parameters: - dotnet-image: - type: string - default: << pipeline.parameters.default-dotnet-image >> - docker: - - image: <> - - image: influxdb:3-core - environment: - - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 - - INFLUXDB3_OBJECT_STORE=file - - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data - docker-arm64-image: - parameters: - dotnet-image: - type: string - default: << pipeline.parameters.default-dotnet-image >> - docker: - - image: <> - - image: influxdb:3-core - environment: - - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 - - INFLUXDB3_OBJECT_STORE=file - - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data - resource_class: arm.medium +#executors: +# docker-amd64-image: +# parameters: +# dotnet-image: +# type: string +# default: << pipeline.parameters.default-dotnet-image >> +# docker: +# - image: <> +# - image: influxdb:3-core +# environment: +# - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 +# - INFLUXDB3_OBJECT_STORE=file +# - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data +# docker-arm64-image: +# parameters: +# dotnet-image: +# type: string +# default: << pipeline.parameters.default-dotnet-image >> +# docker: +# - image: <> +# - image: influxdb:3-core +# environment: +# - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 +# - INFLUXDB3_OBJECT_STORE=file +# - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data +# resource_class: arm.medium jobs: tests-unit: From 9b9c3a37f89cecd7af37343a8e9f63f9f25054d3 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 15:44:29 +0700 Subject: [PATCH 11/17] feat: add amd image --- .circleci/config.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b6bead6..9ac6590 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,4 @@ version: 2.1 - commands: client-test: parameters: @@ -46,43 +45,12 @@ commands: - store_test_results: path: test-results -#executors: -# docker-amd64-image: -# parameters: -# dotnet-image: -# type: string -# default: << pipeline.parameters.default-dotnet-image >> -# docker: -# - image: <> -# - image: influxdb:3-core -# environment: -# - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 -# - INFLUXDB3_OBJECT_STORE=file -# - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data -# docker-arm64-image: -# parameters: -# dotnet-image: -# type: string -# default: << pipeline.parameters.default-dotnet-image >> -# docker: -# - image: <> -# - image: influxdb:3-core -# environment: -# - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 -# - INFLUXDB3_OBJECT_STORE=file -# - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data -# resource_class: arm.medium jobs: tests-unit: working_directory: ~/repo - parameters: - dotnet-image: - type: string - default: mcr.microsoft.com/dotnet/sdk:8.0 docker: - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" -# - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8" steps: - checkout - client-test: @@ -148,9 +116,6 @@ workflows: jobs: - check-compilation-warnings - tests-unit - - tests-unit: - parameters: - dotnet-image: mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8m - tests-integration: requires: - "tests-unit" From 5ec67953068511c8cd52fde420d65b07debd82f8 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 15:47:09 +0700 Subject: [PATCH 12/17] feat: add amd image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9ac6590..6f40ced 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,7 @@ jobs: tests-unit: working_directory: ~/repo docker: - - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0" + - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8" steps: - checkout - client-test: From b1d46ecaaff2ce33c0ab09783369d6c657ce6cd2 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 16:06:16 +0700 Subject: [PATCH 13/17] feat: add amd image --- .circleci/config.yml | 116 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 94 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f40ced..538d563 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,6 +5,9 @@ commands: project: type: string default: "Client.Test" + exe: + type: executor + default: docker-amd64-image steps: - run: name: Install Dependencies @@ -27,43 +30,104 @@ commands: mv report/summary.html /tmp/artifacts cp test-results/test-result.xml /tmp/artifacts when: always + - when: + condition: + equal: [ docker-amd64-image, << parameters.exe >> ] + steps: + - upload-codecov-amd64 + - when: + condition: + equal: [ docker-arm64-image, << parameters.exe >> ] + steps: + - upload-codecov-arm64 + - store_artifacts: + path: /tmp/artifacts + - store_test_results: + path: test-results + upload-codecov-amd64: + steps: - run: - name: Report test results to codecov + name: Collecting coverage reports command: | - apt-get update - apt-get install gpg --yes curl -Os https://uploader.codecov.io/latest/linux/codecov curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import + curl -s https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import gpgv codecov.SHA256SUM.sig codecov.SHA256SUM shasum -a 256 -c codecov.SHA256SUM chmod +x ./codecov ./codecov - - store_artifacts: - path: /tmp/artifacts - - store_test_results: - path: test-results + upload-codecov-arm64: + steps: + - run: + name: Collecting coverage reports + command: | + curl -k https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import + curl -Os https://uploader.codecov.io/v0.8.0/aarch64/codecov + curl -Os https://uploader.codecov.io/v0.8.0/aarch64/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/v0.8.0/aarch64/codecov.SHA256SUM.sig + gpgv codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + sudo chmod +x codecov +parameters: + default-dotnet-image: + type: string + default: "mcr.microsoft.com/dotnet/sdk:8.0" + +executors: + docker-amd64-image: + parameters: + dotnet-image: + type: string + default: << pipeline.parameters.default-dotnet-image >> + docker: + - image: <> + - image: influxdb:3-core + environment: + - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 + - INFLUXDB3_OBJECT_STORE=file + - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data + docker-arm64-image: + parameters: + dotnet-image: + type: string + default: << pipeline.parameters.default-dotnet-image >> + docker: + - image: <> + - image: influxdb:3-core + environment: + - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 + - INFLUXDB3_OBJECT_STORE=file + - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data + resource_class: arm.medium jobs: tests-unit: working_directory: ~/repo - docker: - - image: &default-dotnet-image "mcr.microsoft.com/dotnet/sdk:8.0-jammy-arm64v8" + parameters: + dotnet-image: + type: string + default: << pipeline.parameters.default-dotnet-image >> + exe: + type: executor + default: docker-amd64-image + executor: << parameters.exe >> steps: - checkout - client-test: + exe: << parameters.exe >> project: "Client.Test" tests-integration: working_directory: ~/repo - docker: - - image: *default-dotnet-image - - image: influxdb:3-core - environment: - - INFLUXDB3_NODE_IDENTIFIER_PREFIX=node01 - - INFLUXDB3_OBJECT_STORE=file - - INFLUXDB3_DB_DIR=/var/lib/influxdb3/data + parameters: + dotnet-image: + type: string + default: << pipeline.parameters.default-dotnet-image >> + exe: + type: executor + default: docker-amd64-image + executor: << parameters.exe >> steps: - checkout - run: @@ -80,10 +144,10 @@ jobs: --export-token-as TESTING_INFLUXDB_TOKEN - client-test: project: "Client.Test.Integration" - + check-compilation-warnings: docker: - - image: *default-dotnet-image + - image: << pipeline.parameters.default-dotnet-image >> steps: - checkout - run: @@ -91,10 +155,10 @@ jobs: command: | dotnet clean --configuration Release dotnet build --configuration Release - + deploy-preview: docker: - - image: *default-dotnet-image + - image: <> steps: - run: name: Early return if this build is from a forked repository @@ -115,8 +179,16 @@ workflows: build: jobs: - check-compilation-warnings - - tests-unit + - tests-unit: + matrix: + parameters: + exe: [ docker-amd64-image, docker-arm64-image ] + dotnet-image: [ << pipeline.parameters.default-dotnet-image >> ] - tests-integration: + matrix: + parameters: + exe: [ docker-amd64-image, docker-arm64-image ] + dotnet-image: [ << pipeline.parameters.default-dotnet-image >> ] requires: - "tests-unit" - deploy-preview: From df2c503f77b54cc564b4e46bbe8c0d84be331c17 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Thu, 21 Aug 2025 16:14:31 +0700 Subject: [PATCH 14/17] chore: CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2c010f..92fa32d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 1.4.0 [unreleased] +### CI + +1. [#170](https://github.com/InfluxCommunity/influxdb3-csharp/pull/170) Add tests for arm64 CircleCI. + ## 1.3.0 [2025-08-12] ### Features From 0537cacb48190d56256a16b11790318a12e725c0 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Fri, 22 Aug 2025 10:47:46 +0700 Subject: [PATCH 15/17] feat: add amd image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 538d563..c5385a9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,7 +176,7 @@ jobs: workflows: version: 2 - build: + build_something: jobs: - check-compilation-warnings - tests-unit: From 5b00d88448327b6c3e43db06b3e9ebb6c1d7fe3c Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Fri, 22 Aug 2025 19:55:36 +0700 Subject: [PATCH 16/17] chore: revert code --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c5385a9..538d563 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,7 +176,7 @@ jobs: workflows: version: 2 - build_something: + build: jobs: - check-compilation-warnings - tests-unit: From 6ffb2c8c54782de63d83a266c939815f130afa58 Mon Sep 17 00:00:00 2001 From: NguyenHoangSon96 Date: Mon, 25 Aug 2025 12:21:32 +0700 Subject: [PATCH 17/17] [EMPTY] trigger CI