Skip to content

Commit 7fefcb3

Browse files
committed
Add test with Firebird 6 snapshot
Restructure matrix
1 parent 75c8ddf commit 7fefcb3

1 file changed

Lines changed: 28 additions & 23 deletions

File tree

.github/workflows/run-tests.yml

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,54 +8,59 @@ jobs:
88
build:
99
strategy:
1010
matrix:
11-
java:
12-
- version: 8
13-
javaInstall: |
14-
8
15-
17
16-
buildProfile: 8
17-
testProfile: 8
18-
- version: 11
19-
javaInstall: |
20-
11
21-
17
22-
buildProfile: 11
11+
buildProfile: [ 8, 11 ]
12+
testProfile: [ 8, 11, 17 ]
13+
firebird: [ '5.0.4' ]
14+
canFail: [ false ]
15+
include:
16+
- buildProfile: 11
17+
testProfile: 11
18+
firebird: '6-snapshot'
19+
canFail: true
20+
exclude:
21+
- buildProfile: 8
2322
testProfile: 11
24-
- version: 11-test-17
25-
javaInstall: |
26-
11
27-
17
28-
buildProfile: 11
23+
- buildProfile: 8
2924
testProfile: 17
25+
- buildProfile: 11
26+
testProfile: 8
3027
runs-on: ubuntu-latest
28+
continue-on-error: ${{ matrix.canFail }}
3129
steps:
3230
- name: Login to Docker Hub
31+
# PRs from forks don't have access to the secrets, skip Docker login and hope we don't hit the rate limit
32+
if: ${{ !github.event.pull_request.head.repo.fork }}
3333
uses: docker/login-action@v4
3434
with:
3535
username: ${{ secrets.DOCKERHUB_USERNAME }}
3636
password: ${{ secrets.DOCKERHUB_TOKEN }}
37-
- uses: juarezr/firebirdsql-github-action@v2.3.0
37+
- name: Setup Firebird ${{ matrix.firebird }}
38+
uses: juarezr/firebirdsql-github-action@v2.3.0
3839
with:
39-
version: '5.0.4'
40+
version: ${{ matrix.firebird }}
4041
firebird_root_password: 'masterkey'
4142
firebird_conf: 'WireCrypt=Enabled,AuthServer=Srp256;Srp;Legacy_Auth;Srp224;Srp384;Srp512,UserManager=Srp;Legacy_UserManager'
4243
- uses: actions/checkout@v6
43-
- name: Set up Java ${{ matrix.java.version }}
44+
- name: Set up Java ${{ matrix.buildProfile }} (build) and ${{ matrix.testProfile }} (test)
4445
uses: actions/setup-java@v5
4546
with:
46-
java-version: ${{ matrix.java.javaInstall }}
47+
# NOTE: The last version (17) is the default; it's used to run Gradle
48+
java-version: |
49+
${{ matrix.buildProfile }}
50+
${{ matrix.testProfile }}
51+
17
4752
distribution: 'temurin'
4853
- name: Setup Gradle
4954
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e
5055
with:
5156
cache-read-only: ${{ github.ref != 'refs/heads/Branch_5_0' }}
5257
- name: Build with Gradle
53-
run: ./gradlew test -PbuildProfile=${{ matrix.java.buildProfile }} -PtestProfile=${{ matrix.java.testProfile }} -Ptest.dbondocker=true -Ptest.db.dir=/var/lib/firebird/data
58+
run: ./gradlew test -PbuildProfile=${{ matrix.buildProfile }} -PtestProfile=${{ matrix.testProfile }} -Ptest.dbondocker=true -Ptest.db.dir=/var/lib/firebird/data
5459
- name: Store Report Artifact
5560
uses: actions/upload-artifact@v7
5661
if: always()
5762
with:
58-
name: report-artifacts-${{ matrix.java.version }}
63+
name: report-artifacts-${{ matrix.buildProfile }}-${{ matrix.testProfile }}-${{ matrix.firebird }}
5964
path: build/reports
6065
compression-level: 9
6166
retention-days: 7

0 commit comments

Comments
 (0)