From 6e5778e813bbf0fe494d9e8498651b038092d6f3 Mon Sep 17 00:00:00 2001 From: Raphael DALMON Date: Tue, 3 Feb 2026 09:28:27 +0100 Subject: [PATCH 1/4] ci: update QuestDB client dependency references in Maven options --- ci/run_tests_pipeline.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/run_tests_pipeline.yaml b/ci/run_tests_pipeline.yaml index 69c3653..f26311e 100644 --- a/ci/run_tests_pipeline.yaml +++ b/ci/run_tests_pipeline.yaml @@ -95,21 +95,21 @@ stages: mavenPOMFile: "questdb/core/pom.xml" jdkVersionOption: "default" goals: "versions:use-dep-version" - options: "-Dincludes=org.questdb:client -DdepVersion=9.9.9 -DforceVersion=true --batch-mode" + options: "-Dincludes=org.questdb:questdb-client -DdepVersion=9.9.9 -DforceVersion=true --batch-mode" - task: Maven@3 displayName: "Update QuestDB client version: benchmarks" inputs: mavenPOMFile: "questdb/benchmarks/pom.xml" jdkVersionOption: "default" goals: "versions:use-dep-version" - options: "-Dincludes=org.questdb:client -DdepVersion=9.9.9 -DforceVersion=true --batch-mode" + options: "-Dincludes=org.questdb:questdb-client -DdepVersion=9.9.9 -DforceVersion=true --batch-mode" - task: Maven@3 displayName: "Update QuestDB client version: utils" inputs: mavenPOMFile: "questdb/utils/pom.xml" jdkVersionOption: "default" goals: "versions:use-dep-version" - options: "-Dincludes=org.questdb:client -DdepVersion=9.9.9 -DforceVersion=true --batch-mode" + options: "-Dincludes=org.questdb:questdb-client -DdepVersion=9.9.9 -DforceVersion=true --batch-mode" - task: Maven@3 displayName: "Compile QuestDB" inputs: From 5ec38bf79df81a7264182536d4a6c9ae580816e6 Mon Sep 17 00:00:00 2001 From: Raphael DALMON Date: Tue, 3 Feb 2026 12:01:58 +0100 Subject: [PATCH 2/4] ci: enhance git clone logic to handle pull request branches --- ci/run_tests_pipeline.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/ci/run_tests_pipeline.yaml b/ci/run_tests_pipeline.yaml index f26311e..59942f7 100644 --- a/ci/run_tests_pipeline.yaml +++ b/ci/run_tests_pipeline.yaml @@ -72,8 +72,21 @@ stages: lfs: false submodules: false - template: setup.yaml - # TODO: remove branch once rd_strip_ilp_sender is merged - - script: git clone --depth 1 -b rd_strip_ilp_sender https://github.com/questdb/questdb.git ./questdb + - bash: | + BRANCH_NAME="$(Build.SourceBranchName)" + if [ "$(Build.Reason)" = "PullRequest" ]; then + BRANCH_NAME="$(System.PullRequest.SourceBranch)" + BRANCH_NAME="${BRANCH_NAME#refs/heads/}" + fi + + if git ls-remote --heads https://github.com/questdb/questdb.git "$BRANCH_NAME" | grep -q "$BRANCH_NAME"; then + TARGET_BRANCH="$BRANCH_NAME" + else + TARGET_BRANCH="rd_strip_ilp_sender" + fi + + echo "Cloning questdb branch: $TARGET_BRANCH" + git clone --depth 1 -b "$TARGET_BRANCH" https://github.com/questdb/questdb.git ./questdb displayName: git clone questdb - task: Maven@3 displayName: "Update client version" From 68f639e710436bb98b68092ab75dbddd1903a72a Mon Sep 17 00:00:00 2001 From: Raphael DALMON Date: Tue, 3 Feb 2026 12:04:22 +0100 Subject: [PATCH 3/4] ci: update QuestDB client version dynamically based on project version --- ci/run_tests_pipeline.yaml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ci/run_tests_pipeline.yaml b/ci/run_tests_pipeline.yaml index 59942f7..5a21aa1 100644 --- a/ci/run_tests_pipeline.yaml +++ b/ci/run_tests_pipeline.yaml @@ -88,13 +88,11 @@ stages: echo "Cloning questdb branch: $TARGET_BRANCH" git clone --depth 1 -b "$TARGET_BRANCH" https://github.com/questdb/questdb.git ./questdb displayName: git clone questdb - - task: Maven@3 - displayName: "Update client version" - inputs: - mavenPOMFile: "core/pom.xml" - jdkVersionOption: "default" - goals: "versions:set" - options: "-DnewVersion=9.9.9 -DgenerateBackupPoms=false --batch-mode" + - bash: | + CLIENT_VERSION=$(mvn -f core/pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout) + echo "Client version: $CLIENT_VERSION" + echo "##vso[task.setvariable variable=CLIENT_VERSION]$CLIENT_VERSION" + displayName: "Get client version" - task: Maven@3 displayName: "Install client to local repo" inputs: @@ -108,21 +106,21 @@ stages: mavenPOMFile: "questdb/core/pom.xml" jdkVersionOption: "default" goals: "versions:use-dep-version" - options: "-Dincludes=org.questdb:questdb-client -DdepVersion=9.9.9 -DforceVersion=true --batch-mode" + options: "-Dincludes=org.questdb:questdb-client -DdepVersion=$(CLIENT_VERSION) -DforceVersion=true --batch-mode" - task: Maven@3 displayName: "Update QuestDB client version: benchmarks" inputs: mavenPOMFile: "questdb/benchmarks/pom.xml" jdkVersionOption: "default" goals: "versions:use-dep-version" - options: "-Dincludes=org.questdb:questdb-client -DdepVersion=9.9.9 -DforceVersion=true --batch-mode" + options: "-Dincludes=org.questdb:questdb-client -DdepVersion=$(CLIENT_VERSION) -DforceVersion=true --batch-mode" - task: Maven@3 displayName: "Update QuestDB client version: utils" inputs: mavenPOMFile: "questdb/utils/pom.xml" jdkVersionOption: "default" goals: "versions:use-dep-version" - options: "-Dincludes=org.questdb:questdb-client -DdepVersion=9.9.9 -DforceVersion=true --batch-mode" + options: "-Dincludes=org.questdb:questdb-client -DdepVersion=$(CLIENT_VERSION) -DforceVersion=true --batch-mode" - task: Maven@3 displayName: "Compile QuestDB" inputs: From 405c3186a3919003242878f1d4d08d3726e9fde3 Mon Sep 17 00:00:00 2001 From: Raphael DALMON Date: Tue, 3 Feb 2026 12:50:44 +0100 Subject: [PATCH 4/4] trigger ci