diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index debdd63..8438984 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,10 +35,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -47,4 +47,6 @@ jobs: run: ./gradlew build - name: Codecov upload - run: bash <(curl -s https://codecov.io/bash) + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af89118..36c2502 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate versions uses: HardNorth/github-version-generate@v1 @@ -50,7 +50,7 @@ jobs: version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }} - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -108,7 +108,7 @@ jobs: - name: Checkout develop branch if: ${{ github.ref }} == 'master' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: 'develop' fetch-depth: 0 diff --git a/build.gradle b/build.gradle index df7f938..e5188b9 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ apply plugin: 'java-library' apply from: "${project.scripts_url}/${project.scripts_branch}/build-quality.gradle" apply from: "${project.scripts_url}/${project.scripts_branch}/release-commons.gradle" apply from: "${project.scripts_url}/${project.scripts_branch}/signing.gradle" +apply from: "${project.scripts_url}/${project.scripts_branch}/jacoco.gradle" sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -81,3 +82,5 @@ processResources { expand(project.properties) } } + +build.dependsOn jacocoTestReport diff --git a/gradle.properties b/gradle.properties index 71fca99..a0f04b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,3 +6,4 @@ mockito_version=3.3.3 powermock_version=2.0.9 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts/ scripts_branch=master +excludeTests=