From 451943b94b4c877af74f427492597395c33710e2 Mon Sep 17 00:00:00 2001 From: everpcpc Date: Fri, 29 Aug 2025 18:08:08 +0800 Subject: [PATCH 1/6] ci: test compatibility in PR --- .github/workflows/test_compatibility.yml | 31 ++++++++++++++++++++--- tests/compatibility/test_compatibility.sh | 17 ++++--------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test_compatibility.yml b/.github/workflows/test_compatibility.yml index f8d8ab9..71953e7 100644 --- a/.github/workflows/test_compatibility.yml +++ b/.github/workflows/test_compatibility.yml @@ -9,8 +9,29 @@ on: - main jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn clean install -DskipTests + - name: Upload JAR artifacts + uses: actions/upload-artifact@v4 + with: + name: databend-jdbc-jars + path: | + databend-jdbc/target/*.jar + retention-days: 1 + test: runs-on: ubuntu-latest + needs: build strategy: fail-fast: false matrix: @@ -23,6 +44,12 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Download JAR artifacts + uses: actions/download-artifact@v4 + with: + name: databend-jdbc-jars + path: databend-jdbc/target/ + - name: Set up JDK 17 uses: actions/setup-java@v4 with: @@ -38,10 +65,6 @@ jobs: env: DATABEND_QUERY_VERSION: ${{ matrix.server }} - - name: Test with conn to nginx - run: mvn clean package -DskipTests - env: - MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Test with conn to nginx working-directory: tests/compatibility diff --git a/tests/compatibility/test_compatibility.sh b/tests/compatibility/test_compatibility.sh index d81d00a..4af0ce1 100644 --- a/tests/compatibility/test_compatibility.sh +++ b/tests/compatibility/test_compatibility.sh @@ -20,18 +20,11 @@ TEST_SIDE=${TEST_SIDE:-server} TEST_VER=${DATABEND_JDB_TEST_VERSION:-$CURRENT_VERSION} JDBC_VER=${DATABEND_JDBC_VERSION:-$CURRENT_VERSION} -if [ "$TEST_SIDE" = "server" ]; then - curl -sSLfo ./databend-jdbc-tests.jar "https://github.com/databendlabs/databend-jdbc/releases/download/v${TEST_VER}/databend-jdbc-${TEST_VER}-tests.jar" -else - cp ../../databend-jdbc/target/databend-jdbc-${TEST_VER}-tests.jar databend-jdbc-tests.jar -fi - -if [ -z "DATABEND_JDBC_VERSION" ]; then - # only for dev - cp ../../databend-jdbc/target/databend-jdbc-${JDBC_VER}.jar databend-jdbc.jar -else - curl -sSLfo "./databend-jdbc-${JDBC_VER}.jar" "https://github.com/databendlabs/databend-jdbc/releases/download/v${JDBC_VER}/databend-jdbc-${JDBC_VER}.jar" -fi +# Always use local artifacts (built in CI or local dev) +cp ../../databend-jdbc/target/databend-jdbc-${TEST_VER}-tests.jar databend-jdbc-tests.jar + +# Always use local artifacts (built in CI or local dev) +cp ../../databend-jdbc/target/databend-jdbc-${JDBC_VER}.jar databend-jdbc.jar export DATABEND_JDBC_VERSION=$JDBC_VER java -Dlogback.logger.root=INFO -cp "testng.jar:slf4j-api.jar:databend-jdbc-${JDBC_VER}.jar:databend-jdbc-tests.jar:jcommander.jar:semver4j.jar" org.testng.TestNG testng.xml From 0c05d4a5ee1ebc0b838d071d5370338716e5ddb4 Mon Sep 17 00:00:00 2001 From: everpcpc Date: Fri, 29 Aug 2025 18:10:31 +0800 Subject: [PATCH 2/6] z --- .github/workflows/code-quality.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 6e9f699..1493067 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -47,7 +47,7 @@ jobs: if: always() with: name: checkstyle-results - path: | + path: | **/target/checkstyle-result.xml **/target/site/checkstyle.html retention-days: 7 From e11188429a56c14ff095a236340834c255923dae Mon Sep 17 00:00:00 2001 From: everpcpc Date: Fri, 29 Aug 2025 18:11:50 +0800 Subject: [PATCH 3/6] z --- .github/workflows/code-quality.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 1493067..0806dea 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -3,15 +3,17 @@ name: Code Quality Check on: pull_request: types: [opened, synchronize, reopened] - branches: [ main, master ] + branches: + - main push: - branches: [ main, master ] - -permissions: - contents: read - pull-requests: write - checks: write - actions: read + branches: + - main + +# permissions: +# contents: read +# pull-requests: write +# checks: write +# actions: read jobs: checkstyle: From 5b37bb3696ca3f9ea7bfa6af1256fc75a6973eff Mon Sep 17 00:00:00 2001 From: everpcpc Date: Fri, 29 Aug 2025 18:11:57 +0800 Subject: [PATCH 4/6] z --- .github/workflows/code-quality.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 0806dea..57c0f44 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -2,7 +2,6 @@ name: Code Quality Check on: pull_request: - types: [opened, synchronize, reopened] branches: - main push: From 2d79d26aa16fb9ab93393d4c28140684678054c8 Mon Sep 17 00:00:00 2001 From: everpcpc Date: Fri, 29 Aug 2025 18:14:51 +0800 Subject: [PATCH 5/6] z --- .github/workflows/test_compatibility.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test_compatibility.yml b/.github/workflows/test_compatibility.yml index 71953e7..7a5e401 100644 --- a/.github/workflows/test_compatibility.yml +++ b/.github/workflows/test_compatibility.yml @@ -38,9 +38,6 @@ jobs: server: - "nightly" - "v1.2.790-nightly" - driver: - - "0.4.0" - - "0.3.9" steps: - uses: actions/checkout@v4 @@ -73,5 +70,4 @@ jobs: MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} DATABEND_TEST_CONN_PORT: 8000 DATABEND_QUERY_VERSION: ${{ matrix.server }} - DATABEND_JDBC_VERSION: ${{ matrix.driver }} TEST_SIDE: "driver" From 6eab5486610450b0589500f22d81059ffe771272 Mon Sep 17 00:00:00 2001 From: everpcpc Date: Fri, 29 Aug 2025 21:39:36 +0800 Subject: [PATCH 6/6] z --- tests/compatibility/test_compatibility.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/compatibility/test_compatibility.sh b/tests/compatibility/test_compatibility.sh index 4af0ce1..90dc65c 100644 --- a/tests/compatibility/test_compatibility.sh +++ b/tests/compatibility/test_compatibility.sh @@ -8,8 +8,6 @@ curl -sSLfo ./jcommander.jar https://repo1.maven.org/maven2/org/jcommander/jcomm curl -sSLfo ./jts-core.jar https://repo1.maven.org/maven2/org/locationtech/jts/jts-core/1.19.0/jts-core-1.19.0.jar curl -sSLfo ./slf4j-api.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.16/slf4j-api-2.0.16.jar - - original_dir=$(pwd) cd ../.. # got 1 if not in java project @@ -20,11 +18,12 @@ TEST_SIDE=${TEST_SIDE:-server} TEST_VER=${DATABEND_JDB_TEST_VERSION:-$CURRENT_VERSION} JDBC_VER=${DATABEND_JDBC_VERSION:-$CURRENT_VERSION} -# Always use local artifacts (built in CI or local dev) -cp ../../databend-jdbc/target/databend-jdbc-${TEST_VER}-tests.jar databend-jdbc-tests.jar +JDBC_JAR="databend-jdbc-${JDBC_VER}.jar" +JDBC_TEST_JAR="databend-jdbc-${TEST_VER}-tests.jar" # Always use local artifacts (built in CI or local dev) -cp ../../databend-jdbc/target/databend-jdbc-${JDBC_VER}.jar databend-jdbc.jar +cp ../../databend-jdbc/target/databend-jdbc-${TEST_VER}-tests.jar databend-jdbc-tests.jar +cp "../../databend-jdbc/target/${JDBC_JAR}" . export DATABEND_JDBC_VERSION=$JDBC_VER -java -Dlogback.logger.root=INFO -cp "testng.jar:slf4j-api.jar:databend-jdbc-${JDBC_VER}.jar:databend-jdbc-tests.jar:jcommander.jar:semver4j.jar" org.testng.TestNG testng.xml +java -Dlogback.logger.root=INFO -cp "testng.jar:slf4j-api.jar:${JDBC_JAR}:${JDBC_TEST_JAR}:jcommander.jar:semver4j.jar" org.testng.TestNG testng.xml