Skip to content

Commit 9fbab85

Browse files
committed
1 parent bc51df1 commit 9fbab85

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.github/actions/download-artifact/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ runs:
1616
steps:
1717
- name: Download artifacts
1818
if: github.event_name != 'workflow_run'
19-
uses: actions/download-artifact@v3
19+
uses: actions/download-artifact@v4
2020
with:
21-
name: ${{ inputs.name }}
21+
pattern: ${{ inputs.name }}
2222
path: ${{ inputs.path }}
23+
merge-multiple: true
2324

2425
- name: Download artifacts
2526
if: github.event_name == 'workflow_run'

.github/actions/prepare-analysis/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
- name: Get reports
1212
uses: ./.github/actions/download-artifact
1313
with:
14-
name: reports
14+
name: reports-*
1515

1616
- name: Get coverage
1717
uses: ./.github/actions/download-artifact

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ jobs:
7979
uses: ./.github/actions/upload-artifact
8080
if: always() # always run even if the previous step fails
8181
with:
82-
name: reports
82+
name: reports-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
8383
filename: ${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
8484
path: target/surefire-reports-*/TEST-*.xml
8585

8686
- name: Upload Coverage Reports
8787
uses: ./.github/actions/upload-artifact
8888
if: always() # always run even if the previous step fails
8989
with:
90-
name: coverage
90+
name: coverage-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
9191
filename: ${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
9292
path: target/jacoco-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}.exec
9393

@@ -109,7 +109,7 @@ jobs:
109109
- name: Get coverage artifact
110110
uses: ./.github/actions/download-artifact
111111
with:
112-
name: coverage
112+
name: coverage-*
113113

114114
- name: Get classes
115115
uses: ./.github/actions/download-artifact

src/test/java/org/xbill/DNS/ZoneStressTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.List;
1010
import java.util.stream.Collectors;
1111
import lombok.SneakyThrows;
12+
import org.junit.jupiter.api.Disabled;
1213
import org.junit.jupiter.api.Tag;
1314
import org.junit.jupiter.api.Test;
1415
import org.openjdk.jcstress.Main;
@@ -23,6 +24,7 @@
2324

2425
class ZoneStressTest {
2526
@Test
27+
@Disabled("Too expensive to always run")
2628
@Tag("concurrency")
2729
void runZoneConcurrentReadStressTest() throws Exception {
2830
// IntelliJ doesn't properly run the JCStress' annotation processor,

0 commit comments

Comments
 (0)