Artifact v4 fixes

https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md
dnsjava · Jul 21, 2024 · 9fbab85 · 9fbab85
1 parent bc51df1
commit 9fbab85
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.github/actions/download-artifact/action.yml b/.github/actions/download-artifact/action.yml
@@ -16,10 +16,11 @@ runs:
   steps:
     - name: Download artifacts
       if: github.event_name != 'workflow_run'
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-        name: ${{ inputs.name }}
+        pattern: ${{ inputs.name }}
         path: ${{ inputs.path }}
+        merge-multiple: true
 
     - name: Download artifacts
       if: github.event_name == 'workflow_run'

diff --git a/.github/actions/prepare-analysis/action.yml b/.github/actions/prepare-analysis/action.yml
@@ -11,7 +11,7 @@ runs:
     - name: Get reports
       uses: ./.github/actions/download-artifact
       with:
-        name: reports
+        name: reports-*
 
     - name: Get coverage
       uses: ./.github/actions/download-artifact

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -79,15 +79,15 @@ jobs:
         uses: ./.github/actions/upload-artifact
         if: always() # always run even if the previous step fails
         with:
-          name: reports
+          name: reports-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
           filename: ${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
           path: target/surefire-reports-*/TEST-*.xml
 
       - name: Upload Coverage Reports
         uses: ./.github/actions/upload-artifact
         if: always() # always run even if the previous step fails
         with:
-          name: coverage
+          name: coverage-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
           filename: ${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
           path: target/jacoco-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}.exec
 
@@ -109,7 +109,7 @@ jobs:
       - name: Get coverage artifact
         uses: ./.github/actions/download-artifact
         with:
-          name: coverage
+          name: coverage-*
 
       - name: Get classes
         uses: ./.github/actions/download-artifact

diff --git a/src/test/java/org/xbill/DNS/ZoneStressTest.java b/src/test/java/org/xbill/DNS/ZoneStressTest.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.SneakyThrows;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.openjdk.jcstress.Main;
@@ -23,6 +24,7 @@
 
 class ZoneStressTest {
   @Test
+  @Disabled("Too expensive to always run")
   @Tag("concurrency")
   void runZoneConcurrentReadStressTest() throws Exception {
     // IntelliJ doesn't properly run the JCStress' annotation processor,