Skip to content

Commit 0389bd2

Browse files
authored
Merge pull request #2488 from guwirth/test-9.9
test with SQ 9.9 LTS
2 parents 7290fe0 + f61ca28 commit 0389bd2

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

.github/workflows/cxx-ci.yml

+18-8
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,15 @@ jobs:
232232
strategy:
233233
matrix:
234234
os: [ubuntu-latest]
235-
java: [ '11' ]
235+
java: [ '11', '17' ]
236236
distribution: [ 'temurin' ]
237-
sonarqube: [ '8.9.10.61524', '9.8.0.63668' ]
238-
sonarscanner: [ '4.7.0.2747' ]
237+
sonarqube: [ '8.9.10.61524', '9.9.0.65466' ]
238+
sonarscanner: [ '4.8.0.2856' ]
239+
exclude:
240+
- sonarqube: '8.9.10.61524'
241+
java: '17'
242+
- sonarqube: '9.9.0.65466'
243+
java: '11'
239244

240245
runs-on: ${{ matrix.os }}
241246
needs: [build-linux, verify-rules]
@@ -361,7 +366,7 @@ jobs:
361366
if: always()
362367
uses: actions/upload-artifact@v3
363368
with:
364-
name: "LOG_sonarqube_${{ matrix.sonarqube }}_${{ matrix.os }}"
369+
name: "LOG_sonarqube_${{ matrix.sonarqube }}_java_${{ matrix.java }}_os_${{ matrix.os }}"
365370
path: "${{ env.SONARLOG }}"
366371

367372

@@ -373,10 +378,15 @@ jobs:
373378
strategy:
374379
matrix:
375380
os: [windows-latest]
376-
java: [ '11' ]
381+
java: [ '11', '17' ]
377382
distribution: [ 'temurin' ]
378-
sonarqube: [ '8.9.10.61524', '9.8.0.63668' ]
379-
sonarscanner: [ '4.7.0.2747' ]
383+
sonarqube: [ '8.9.10.61524', '9.9.0.65466' ]
384+
sonarscanner: [ '4.8.0.2856' ]
385+
exclude:
386+
- sonarqube: '8.9.10.61524'
387+
java: '17'
388+
- sonarqube: '9.9.0.65466'
389+
java: '11'
380390

381391
runs-on: ${{ matrix.os }}
382392
# needs build-linux because of JAR artifacts
@@ -508,7 +518,7 @@ jobs:
508518
if: always()
509519
uses: actions/upload-artifact@v3
510520
with:
511-
name: "LOG_sonarqube_${{ matrix.sonarqube }}_${{ matrix.os }}"
521+
name: "LOG_sonarqube_${{ matrix.sonarqube }}_java_${{ matrix.java }}_os_${{ matrix.os }}"
512522
path: "${{ env.SONARLOG }}"
513523

514524

0 commit comments

Comments
 (0)