Skip to content

Commit 6604f00

Browse files
authored
Merge pull request #52 from Willena/develop
Merge for 3.36.0 release
2 parents 2a4eafe + 96034aa commit 6604f00

File tree

113 files changed

+10514
-8865
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+10514
-8865
lines changed

.github/workflows/test.yml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '**.java'
7+
- '**.xml'
8+
- '**.so'
9+
- '**.jnilib'
10+
- '**.dll'
11+
- '.github/workflows/*.yml'
12+
push:
13+
branches:
14+
- master
15+
paths:
16+
- '**.java'
17+
- '**.xml'
18+
- '**.so'
19+
- '**.jnilib'
20+
- '**.dll'
21+
- '.github/workflows/*.yml'
22+
23+
jobs:
24+
lint:
25+
name: Check code formatting
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@v2
29+
- uses: actions/setup-java@v2
30+
with:
31+
distribution: 'adopt'
32+
java-version: 11
33+
java-package: jdk
34+
cache: 'maven'
35+
- name: spotless:check
36+
run: mvn spotless:check
37+
38+
test:
39+
name: test ${{ matrix.os }} jdk${{ matrix.java }}
40+
strategy:
41+
matrix:
42+
os: [ubuntu-latest, windows-latest, macos-latest]
43+
java: [8, 11, 16]
44+
exclude:
45+
- os: windows-latest
46+
java: 11
47+
- os: windows-latest
48+
java: 8
49+
- os: macos-latest
50+
java: 11
51+
- os: macos-latest
52+
java: 8
53+
runs-on: ${{ matrix.os }}
54+
steps:
55+
- uses: actions/checkout@v2
56+
- uses: actions/setup-java@v2
57+
with:
58+
distribution: 'adopt'
59+
java-version: ${{ matrix.java }}
60+
java-package: jdk
61+
cache: 'maven'
62+
- name: Test
63+
run: mvn test
64+
65+
test_graalvm:
66+
name: test ubuntu-latest jdk11 GraalVM native-image
67+
runs-on: ubuntu-latest
68+
steps:
69+
- uses: actions/checkout@v2
70+
- uses: DeLaGuardo/setup-graalvm@master
71+
with:
72+
# GraalVM version, no pattern syntax available atm
73+
graalvm: '21.0.0.2'
74+
# Java version, optional, defaults to 'java8'. Available options are 'java8' and 'java11'.
75+
java: 'java11'
76+
# Architecture flag, optional, defaults to 'amd64'. Available options are 'amd64' and 'aarch64'. Later is available only for linux runners.
77+
arch: 'amd64'
78+
- name: Install native-image component
79+
run: |
80+
gu install native-image
81+
- name: Test
82+
run: mvn -Pnative test

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ before_deploy:
4343
- git config --local user.email "[email protected]"
4444
- sudo apt-get install -y zip
4545
- source VERSION
46-
- zip -r ./sqlite-natives-$version.zip ./src/main/resources/org/sqlite/native
46+
- zip -r ./sqlite-natives-$artifactVersion.zip ./src/main/resources/org/sqlite/native
4747
- make deploy
4848
addons:
4949
apt:
@@ -58,13 +58,13 @@ deploy:
5858
overwrite: true
5959
file_glob: true
6060
file:
61-
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$version.jar"
62-
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$version-javadoc.jar"
63-
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$version-sources.jar"
64-
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$version.jar.asc"
65-
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$version-javadoc.jar.asc"
66-
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$version-sources.jar.asc"
67-
- "/home/travis/build/Willena/sqlite-jdbc-crypt/sqlite-natives-$version.zip"
61+
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$artifactVersion.jar"
62+
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$artifactVersion-javadoc.jar"
63+
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$artifactVersion-sources.jar"
64+
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$artifactVersion.jar.asc"
65+
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$artifactVersion-javadoc.jar.asc"
66+
- "/home/travis/build/Willena/sqlite-jdbc-crypt/target/sqlite-jdbc-$artifactVersion-sources.jar.asc"
67+
- "/home/travis/build/Willena/sqlite-jdbc-crypt/sqlite-natives-$artifactVersion.zip"
6868

6969
skip_cleanup: true
7070
name: SQLite-jdbc-$version

0 commit comments

Comments
 (0)