Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

prepare CI to test with SQ 10.x #2613

Closed
wants to merge 1 commit into from
Closed

prepare CI to test with SQ 10.x #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 12 additions & 22 deletions .github/workflows/cxx-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ jobs:

# -----------------------------------------------------------------------------------------------------------
# Going through the Maven cycles 'validate', 'compile', 'test', 'package' in all combinations to be supported
# The result of 'package' is uploaded as artifact for Ubuntu Linux Java 11 Temurin
# The result of 'package' is uploaded as artifact for Ubuntu Linux Java 17 Temurin
# -----------------------------------------------------------------------------------------------------------
build-linux:

strategy:
matrix:
os: [ubuntu-latest]
java: [ '11' ]
java: [ '17' ]
distribution: [ 'temurin' ]

runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -144,10 +144,10 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

# create artifacts from Linux, Java 11 Temurin
# create artifacts from Linux, Java 17 Temurin
#
- name: Collect JAR files
if: matrix.os == 'ubuntu-latest' && matrix.java == '11' && matrix.distribution == 'temurin'
if: matrix.os == 'ubuntu-latest' && matrix.java == '17' && matrix.distribution == 'temurin'
run: |
mkdir staging
cp sonar-cxx-plugin/target/*.jar staging
Expand All @@ -167,14 +167,14 @@ jobs:

# -----------------------------------------------------------------------------------------------------------
# Going through the Maven cycles 'validate', 'compile', 'test', 'package' in all combinations to be supported
# The result of 'package' is uploaded as artifact for Ubuntu Linux Java 11 Temurin
# The result of 'package' is uploaded as artifact for Ubuntu Linux Java 17 Temurin
# -----------------------------------------------------------------------------------------------------------
build-windows:

strategy:
matrix:
os: [windows-latest]
java: [ '11' ]
java: [ '17' ]
distribution: [ 'temurin' ]

runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -232,15 +232,10 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
java: [ '11', '17' ]
java: [ '17' ]
distribution: [ 'temurin' ]
sonarqube: [ '8.9.10.61524', '9.9.1.69595' ]
sonarscanner: [ '4.8.0.2856' ]
exclude:
- sonarqube: '8.9.10.61524'
java: '17'
- sonarqube: '9.9.1.69595'
java: '11'
sonarqube: [ '9.9.1.69595', '10.3.0.82913' ]
sonarscanner: [ '5.0.1.3006' ]

runs-on: ${{ matrix.os }}
needs: [build-linux, verify-rules]
Expand Down Expand Up @@ -378,15 +373,10 @@ jobs:
strategy:
matrix:
os: [windows-latest]
java: [ '11', '17' ]
java: [ '17' ]
distribution: [ 'temurin' ]
sonarqube: [ '8.9.10.61524', '9.9.1.69595' ]
sonarscanner: [ '4.8.0.2856' ]
exclude:
- sonarqube: '8.9.10.61524'
java: '17'
- sonarqube: '9.9.1.69595'
java: '11'
sonarqube: [ '9.9.1.69595', '10.3.0.82913' ]
sonarscanner: [ '5.0.1.3006' ]

runs-on: ${{ matrix.os }}
# needs build-linux because of JAR artifacts
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
<woodstox-core.version>6.5.1</woodstox-core.version>

<!-- plugins -->
<java.version>11</java.version>
<java.version>17</java.version>
<jython-standalone.version>2.7.3</jython-standalone.version>
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<maven-compiler.version>3.11.0</maven-compiler.version>
Expand Down
Loading