diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 6e9f699..57c0f44 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -2,16 +2,17 @@ name: Code Quality Check on: pull_request: - types: [opened, synchronize, reopened] - branches: [ main, master ] + branches: + - main push: - branches: [ main, master ] + branches: + - main -permissions: - contents: read - pull-requests: write - checks: write - actions: read +# permissions: +# contents: read +# pull-requests: write +# checks: write +# actions: read jobs: checkstyle: @@ -47,7 +48,7 @@ jobs: if: always() with: name: checkstyle-results - path: | + path: | **/target/checkstyle-result.xml **/target/site/checkstyle.html retention-days: 7 diff --git a/.github/workflows/test_compatibility.yml b/.github/workflows/test_compatibility.yml index f8d8ab9..7a5e401 100644 --- a/.github/workflows/test_compatibility.yml +++ b/.github/workflows/test_compatibility.yml @@ -9,20 +9,44 @@ 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: server: - "nightly" - "v1.2.790-nightly" - driver: - - "0.4.0" - - "0.3.9" 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 +62,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 @@ -50,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" diff --git a/tests/compatibility/test_compatibility.sh b/tests/compatibility/test_compatibility.sh index 75f016e..90dc65c 100644 --- a/tests/compatibility/test_compatibility.sh +++ b/tests/compatibility/test_compatibility.sh @@ -21,18 +21,9 @@ JDBC_VER=${DATABEND_JDBC_VERSION:-$CURRENT_VERSION} JDBC_JAR="databend-jdbc-${JDBC_VER}.jar" JDBC_TEST_JAR="databend-jdbc-${TEST_VER}-tests.jar" -if [ "$TEST_SIDE" = "server" ]; then - curl -sSLfO "https://github.com/databendlabs/databend-jdbc/releases/download/v${TEST_VER}/${JDBC_TEST_JAR}" -else - cp "../../databend-jdbc/target/${JDBC_TEST_JAR}" . -fi - -if [ -z "DATABEND_JDBC_VERSION" ]; then - # test main branch - cp "../../databend-jdbc/target/${JDBC_JAR}" . -else - curl -sSLfO "https://github.com/databendlabs/databend-jdbc/releases/download/v${JDBC_VER}/${JDBC_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 +cp "../../databend-jdbc/target/${JDBC_JAR}" . export DATABEND_JDBC_VERSION=$JDBC_VER 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