Fix: upload separate artifacts for each os/arch

Merging artifacts is no longer supported by upload-artifact v4.
LoveTropics · Oct 13, 2024 · d3170fd · d3170fd
1 parent 1fcafda
commit d3170fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/common/java-natives/linux/action.yml b/.github/workflows/common/java-natives/linux/action.yml
@@ -41,5 +41,5 @@ runs:
  - name: Upload artifact
  uses: actions/upload-artifact@v4
  with:
- name: natives
+ name: natives-${{ runner.os }}-${{ matrix.arch }}
  path: bindings/java/native/build/libs/
diff --git a/.github/workflows/common/java-natives/macos/action.yml b/.github/workflows/common/java-natives/macos/action.yml
@@ -34,5 +34,5 @@ runs:
  - name: Upload artifact
  uses: actions/upload-artifact@v4
  with:
- name: natives
+ name: natives-${{ runner.os }}-${{ matrix.arch }}
  path: bindings/java/native/build/libs/
diff --git a/.github/workflows/common/java-natives/windows/action.yml b/.github/workflows/common/java-natives/windows/action.yml
@@ -38,5 +38,5 @@ runs:
  - name: Upload artifact
  uses: actions/upload-artifact@v4
  with:
- name: natives
+ name: natives-${{ runner.os }}-${{ matrix.arch }}
  path: bindings/java/native/build/libs/
diff --git a/.github/workflows/publish-java.yml b/.github/workflows/publish-java.yml
@@ -97,9 +97,10 @@ jobs:
  uses: actions/checkout@v4
 
  - name: Download natives
- uses: actions/download-artifact@v2
+ uses: actions/download-artifact@v4
  with:
- name: natives
+ pattern: dist-*
+ merge-multiple: true
  path: bindings/java/bin/
 
  - name: Setup Gradle