Skip to content

Commit d7861af

Browse files
committed
Maintenance
- Update Renovate config to group dependencies - Update dependencies - Add som of the IDE config to the repository - Fix Index Scan execution steps - Migrate to new CodeCov config {minor} Signed-off-by: Esta Nagy <nagyesta@gmail.com>
1 parent 2313b25 commit d7861af

File tree

16 files changed

+264
-1642
lines changed

16 files changed

+264
-1642
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ jobs:
7272
- name: Perform CodeQL Analysis
7373
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
7474
- name: Check dependencies with Gradle
75-
run: ./gradlew ossIndexAudit -PossIndexUsername=${{ secrets.OSS_INDEX_USER }} -PossIndexPassword=${{ secrets.OSS_INDEX_PASSWORD }}
75+
run: ./gradlew ossIndexAudit -PossIndexUsername=${{ secrets.OSS_INDEX_USER }} -PossIndexPassword=${{ secrets.OSS_INDEX_PASSWORD }} --info

.github/workflows/gradle-ci.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ on:
2626
- 'renovate.json'
2727
- '.whitesource'
2828
- 'config/ossindex/exclusions.txt'
29+
- '.idea/**'
30+
- '.gitignore'
2931

3032
permissions: read-all
3133

@@ -92,19 +94,25 @@ jobs:
9294
if: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'nagyesta' }}
9395
with:
9496
token: ${{ secrets.CODECOV_TOKEN }}
95-
file: ./file-barj-core/build/reports/jacoco/report.xml
97+
files: ./file-barj-core/build/reports/jacoco/report.xml
9698
flags: core
99+
disable_search: true
100+
fail_ci_if_error: false
97101
- name: Upload coverage to Codecov - Job (if Ubuntu)
98102
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
99103
if: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'nagyesta' }}
100104
with:
101105
token: ${{ secrets.CODECOV_TOKEN }}
102-
file: ./file-barj-job/build/reports/jacoco/report.xml
106+
files: ./file-barj-job/build/reports/jacoco/report.xml
103107
flags: job
108+
disable_search: true
109+
fail_ci_if_error: false
104110
- name: Upload coverage to Codecov - Stream IO (if Ubuntu)
105111
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
106112
if: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'nagyesta' }}
107113
with:
108114
token: ${{ secrets.CODECOV_TOKEN }}
109-
file: ./file-barj-stream-io/build/reports/jacoco/report.xml
115+
files: ./file-barj-stream-io/build/reports/jacoco/report.xml
110116
flags: stream
117+
disable_search: true
118+
fail_ci_if_error: false

.github/workflows/gradle-oss-index-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828
with:
2929
cache-disabled: true
3030
- name: Check dependencies with Gradle
31-
run: ./gradlew ossIndexAudit -PossIndexUsername=${{ secrets.OSS_INDEX_USER }} -PossIndexPassword=${{ secrets.OSS_INDEX_PASSWORD }}
31+
run: ./gradlew ossIndexAudit -PossIndexUsername=${{ secrets.OSS_INDEX_USER }} -PossIndexPassword=${{ secrets.OSS_INDEX_PASSWORD }} --info

.github/workflows/gradle.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ on:
3030
- 'gradlew'
3131
- 'gradlew.bat'
3232
- 'config/ossindex/exclusions.txt'
33+
- '.idea/**'
34+
- '.gitignore'
3335

3436
permissions: read-all
3537

@@ -82,17 +84,23 @@ jobs:
8284
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
8385
with:
8486
token: ${{ secrets.CODECOV_TOKEN }}
85-
file: ./file-barj-core/build/reports/jacoco/report.xml
87+
files: ./file-barj-core/build/reports/jacoco/report.xml
8688
flags: core
89+
disable_search: true
90+
fail_ci_if_error: false
8791
- name: Upload coverage to Codecov - Job
8892
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
8993
with:
9094
token: ${{ secrets.CODECOV_TOKEN }}
91-
file: ./file-barj-job/build/reports/jacoco/report.xml
95+
files: ./file-barj-job/build/reports/jacoco/report.xml
9296
flags: job
97+
disable_search: true
98+
fail_ci_if_error: false
9399
- name: Upload coverage to Codecov - Stream IO
94100
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
95101
with:
96102
token: ${{ secrets.CODECOV_TOKEN }}
97-
file: ./file-barj-stream-io/build/reports/jacoco/report.xml
103+
files: ./file-barj-stream-io/build/reports/jacoco/report.xml
98104
flags: stream
105+
disable_search: true
106+
fail_ci_if_error: false

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ build/
1414
.sts4-cache
1515

1616
### IntelliJ IDEA ###
17-
.idea
17+
.idea/**
18+
!.idea/icon.png
19+
!.idea/codeStyles
20+
!.idea/codeStyles/**
21+
!.idea/inspectionProfiles
22+
!.idea/inspectionProfiles/**
1823
*.iws
1924
*.iml
2025
*.ipr

.idea/codeStyles/Project.xml

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/icon.png

53 KB
Loading

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 39 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ subprojects {
201201
isPrintBanner = false
202202
isColorEnabled = true
203203
isShowAll = false
204-
outputFormat = OutputFormat.DEPENDENCY_GRAPH
204+
outputFormat = OutputFormat.DEFAULT
205205
@Suppress("UNCHECKED_CAST")
206206
excludeVulnerabilityIds = rootProject.extra.get("ossIndexExclusions") as MutableSet<String>
207207
}
@@ -243,7 +243,7 @@ ossIndexAudit {
243243
isPrintBanner = false
244244
isColorEnabled = true
245245
isShowAll = false
246-
outputFormat = OutputFormat.DEPENDENCY_GRAPH
246+
outputFormat = OutputFormat.DEFAULT
247247
@Suppress("UNCHECKED_CAST")
248248
excludeVulnerabilityIds = rootProject.extra.get("ossIndexExclusions") as MutableSet<String>
249249
}

0 commit comments

Comments
 (0)