Skip to content

Commit

Permalink
Prep for 3.2.0 release (#517)
Browse files Browse the repository at this point in the history
* Prep for 3.2.0 release

* cqf-tooling pre-release-3.2.0 WIP. Fixing RefreshIGOperationTest-testBundledFiles

* cqf-tooling pre-release-3.2.0
Fixed issue with Jetty version conflicts. Forced use of jetty 11.0.16 as per wiremock requirement

* cqf-tooling pre-release-3.2.0
Using newer version of Wiremock and changed jetty version to 11.0.20 as per wiremock 3.4.2 requirement

* Add Checkstyle and Error Prone, fix violations, diasble test in CI

* Fixups for Github actions

* Fix jacoco execution

* Fix the argline

---------

Co-authored-by: daviddieppois <david.dieppois@smilecdr.com>
  • Loading branch information
JPercival and daviddieppois authored Mar 1, 2024
1 parent 241bd02 commit 8ed5d7f
Show file tree
Hide file tree
Showing 22 changed files with 298 additions and 151 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
maven:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
Expand All @@ -31,11 +31,12 @@ jobs:
MAVEN_USERNAME: ${{ vars.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
- name: Publish test report
uses: mikepenz/action-junit-report@v3
uses: mikepenz/action-junit-report@v4
if: success() || failure() # always run even if the previous step fails
with:
report_paths: "**/target/surefire-reports/TEST-*.xml"
job_name: "Build"
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
21 changes: 12 additions & 9 deletions .github/workflows/check-pr.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Check PR
on: pull_request

on:
pull_request:
types: [opened, reopened, synchronize]

permissions:
checks: write

Expand All @@ -11,11 +13,11 @@ concurrency:
jobs:
maven:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
matrix:
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
Expand All @@ -26,12 +28,13 @@ jobs:
- name: Tests and additional checks
run: ./mvnw --batch-mode --no-transfer-progress -T 4 verify -Ppackage
- name: Publish test report
uses: mikepenz/action-junit-report@v3
if: success() || failure() # always run even if the previous step fails
uses: mikepenz/action-junit-report@v4
if: (success() || failure()) && matrix.os == 'ubuntu-latest'
with:
report_paths: "**/target/surefire-reports/TEST-*.xml"
job_name: "Check PR"
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
if: matrix.os == 'ubuntu-latest'
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
10 changes: 10 additions & 0 deletions .mvn/jvm.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
2 changes: 1 addition & 1 deletion codecov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ coverage:
patch:
default:
# basic
target: 80
target: 80%
threshold: 0%
base: auto
# advanced
Expand Down
58 changes: 58 additions & 0 deletions config/checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">

<!--
Derived Checkstyle configuration that checks the Google naming conventions from Google Java Style
that can be found at https://google.github.io/styleguide/javaguide.html Formatting conventions are
enforced by the spotless plugin.
This configuration is based on the Google Checks that can be found at:
https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
-->

<module name="Checker">
<property name="charset" value="UTF-8" />
<property name="fileExtensions" value="java, properties, xml" />

<module name="SuppressWarningsFilter" />

<!-- Excludes all 'module-info.java' files -->
<!-- See https://checkstyle.org/filefilters/index.html -->
<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern" value="module\-info\.java$" />
</module>

<module name="TreeWalker">
<!-- Make the @SuppressWarnings annotations available to Checkstyle -->
<module name="SuppressWarningsHolder" />
<module name="AbstractClassName">
<property name="format" value="^(Base|Abstract).+$" />
</module>
<module name="MemberName">
<property name="format"
value="^(?!((m|s|my|our|the)[A-Z])[a-zA-Z0-9]*)([a-z][a-zA-Z0-9]*)$" />
<message key="name.invalidPattern"
value="Member ''{0}'' should be named with camelCase and without prefixes." />
</module>
<module name="ParameterName">
<property name="format"
value="^(?!((m|s|my|our|the)[A-Z])[a-zA-Z0-9]*)([a-z][a-zA-Z0-9]*)$" />
<message key="name.invalidPattern"
value="Member ''{0}'' should be named with camelCase and without prefixes." />
</module>
<module name="MethodName">
<property name="format"
value="^(?!((m|s|my|our|the)[A-Z])[a-zA-Z0-9]*)([a-z][a-zA-Z0-9]*)$" />
<message key="name.invalidPattern"
value="Member ''{0}'' should be named with camelCase and without prefixes." />
</module>
<module name="StaticVariableName">
<property name="format"
value="^(?!((m|s|my|our|the)[A-Z])[a-zA-Z0-9]*)([a-z][a-zA-Z0-9]*)$" />
<message key="name.invalidPattern"
value="Member ''{0}'' should be named with camelCase and without prefixes." />
</module>
<module name="NoFinalizer" />
</module>
</module>
Loading

0 comments on commit 8ed5d7f

Please sign in to comment.