Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
wangliang181230 authored Sep 13, 2023
2 parents d424efc + 26d8cdb commit ce21036
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
fi
# step 5
- name: "Codecov"
if: matrix.java == '17'
uses: codecov/codecov-action@v2.1.0
if: matrix.java == '8'
uses: codecov/codecov-action@v3.1.4

# job 2: Test on 'arm64v8/ubuntu' OS.
build_arm64-binary:
Expand Down
64 changes: 64 additions & 0 deletions .github/workflows/test-druid.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: "test-druid"

on:
push:
branches: [ test*, "*.*.*" ]

jobs:
test-druid:
name: "test-druid"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
java: [ 8, 11, 17 ]
druid: [
1.2.19,
#1.2.18, # Unit test triggered a bug in Druid, see the commit https://github.com/alibaba/druid/commit/6c493f852852fb287ed5fd31ee16c27ead0ea5cf
#1.2.17, # Unit test triggered a bug in Druid, see the commit https://github.com/alibaba/druid/commit/6c493f852852fb287ed5fd31ee16c27ead0ea5cf
1.2.16,
1.2.15,
1.2.14,
1.2.13,
1.2.12,
1.2.11,
1.2.10,
1.2.9,
1.2.8,
1.2.7,
1.2.6,
1.2.5,
1.2.4,
1.2.3,
1.2.2,
1.2.1,
1.2.0,

# not support druid:1.x
#1.1.24,
#1.1.23,
#1.1.22,
#1.1.21,
#1.1.20,
]
steps:
# step 1
- name: "Checkout"
uses: actions/checkout@v3
# step 2
- name: "Set up Java JDK"
uses: actions/setup-java@v3.12.0
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
# step 3
- name: "Print maven version"
run: ./mvnw -version
# step 4
- name: "Test with Maven"
run: |
if [ "${{ matrix.java }}" == "8" ]; then
./mvnw -T 4C clean test -Ddruid.version=${{ matrix.druid }} -Dcheckstyle.skip=false -Dlicense.skip=false -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
else
./mvnw -T 4C clean test -Ddruid.version=${{ matrix.druid }} -Dcheckstyle.skip=true -Dlicense.skip=true -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
fi
2 changes: 1 addition & 1 deletion dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<mariadb.version>2.7.2</mariadb.version>
<dm.version>8.1.2.192</dm.version>
<!-- db connection pool -->
<druid.version>1.2.6</druid.version>
<druid.version>1.2.7</druid.version>
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
<hikari.version>3.4.3</hikari.version>
<!-- sql parser -->
Expand Down

0 comments on commit ce21036

Please sign in to comment.