Skip to content

Commit 3bade61

Browse files
authored
Merge branch 'ReactiveX:4.x' into FixParallelTestNGFailures
2 parents f40e3eb + 4151bfa commit 3bade61

2 files changed

Lines changed: 28 additions & 1 deletion

File tree

.github/workflows/entropy-beauty-scan.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,27 @@ jobs:
1414
- name: Checkout code (full history)
1515
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1616
with:
17-
fetch-depth: 0
17+
# Use shallow clone by default (much faster)
18+
# Only use full history when necessary (push/release or when base commit is needed)
19+
fetch-depth: ${{ github.event_name == 'pull_request_target' && 2 || 0 }}
20+
21+
- name: Cache pip manually
22+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
23+
with:
24+
path: ~/.cache/pip
25+
key: ${{ runner.os }}-pip-entropy-${{ hashFiles('.github/workflows/compute-entropy.py') }}
26+
restore-keys: |
27+
${{ runner.os }}-pip-entropy-
28+
29+
- name: Setup Python
30+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
31+
with:
32+
python-version: '3.12'
33+
34+
- name: Install Python dependencies (only when needed)
35+
run: |
36+
python -m pip install --upgrade pip
37+
# No extra packages needed — compute-entropy.py uses only stdlib
1838
1939
- name: Run TruffleHog
2040
uses: trufflesecurity/trufflehog@586f66d7886cd0b037c7c245d4a6e34ef357ab10 # main (as of March 2026)

build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,13 @@ tasks.register('testNG', Test) {
203203
junitXml.outputLocation = file("${buildDir}/test-results/test") // ← important
204204
}
205205

206+
// Ensure JUnit-compatible XML output in the standard location
207+
reports {
208+
html.required = true
209+
junitXml.required = true
210+
junitXml.outputLocation = file("${buildDir}/test-results/test") // ← important
211+
}
212+
206213
// Optional: fine-tune includes/excludes
207214
// include '**/*NgTest.class', '**/*TestNG.class'
208215
// exclude '**/*JUnitTest.class'

0 commit comments

Comments
 (0)