Skip to content

Commit e40abfa

Browse files
committed
Add windows to test matrix
1 parent 2511173 commit e40abfa

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,36 @@ jobs:
2020
run: ./gradlew checkstyleMain checkstyleTest
2121

2222
build:
23-
runs-on: ubuntu-latest
24-
needs: [check]
2523
strategy:
2624
matrix:
25+
os: [ubuntu-latest, windows-latest]
2726
pg: [10, 11, 12, 13]
2827
jdk: [8, 11]
28+
runs-on: ${{ matrix.os }}
29+
needs: [check]
2930
steps:
3031
- uses: actions/checkout@v2
3132
- uses: actions/setup-java@v1
3233
with:
3334
java-version: ${{ matrix.jdk }}
35+
3436
- name: Setup PostgreSQL SSL Permissions
37+
if: ${{ matrix.os != 'windows-latest' }}
3538
run: |
3639
chmod 0400 ./driver/src/test/resources/certdir/server/server.key
3740
sudo chown 70:70 ./driver/src/test/resources/certdir/server/server.key
3841
- name: Build & Test
3942
run: ./gradlew -PpostgresVersions=${{ matrix.pg }} test -x checkstyleMain -x checkstyleTest
4043

44+
- name: Updload Reports
45+
uses: actions/upload-artifact@v2
46+
if: always()
47+
with:
48+
name: reports
49+
path: |
50+
**/build/reports/
51+
**/build/test-results/
52+
4153
deploy:
4254
needs: [check, build]
4355
if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/rel/v')

driver/src/build/testing.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ fun checkServerKeyPermissions(): Boolean {
160160
}
161161
return true
162162
}
163-
catch(x: IOException) {
163+
catch(x: Throwable) {
164164
project.logger.warn(
165165
"DISABLING SSL, unable to determine required owner/permissions for $serverKey"
166166
)

0 commit comments

Comments
 (0)