From 1abecf97d2f7e16ab98ced48bc994829b50147a4 Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Wed, 31 Jan 2024 18:10:24 +0100
Subject: [PATCH] gradle.yml, graalvm.yml: update upload-artifact to v4

Also adjust artifact name as v4 rejects uploads with duplicate names.
---
 .github/workflows/graalvm.yml | 4 ++--
 .github/workflows/gradle.yml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml
index de5b8eb297a..0e370826060 100644
--- a/.github/workflows/graalvm.yml
+++ b/.github/workflows/graalvm.yml
@@ -29,7 +29,7 @@ jobs:
           gradle-version: ${{ matrix.gradle }}
           arguments: test nativeCompile --init-script build-scan-agree.gradle --scan --info --stacktrace
       - name: Upload wallet-tool as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: wallet-tool-${{ matrix.os }}
+          name: wallet-tool-${{ matrix.os }}-${{ matrix.java-version }}
           path: wallettool/build/native/nativeCompile/wallet-tool
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 6d28d9e5843..8c18266e43f 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -34,10 +34,10 @@ jobs:
           gradle-version: ${{ matrix.gradle }}
           arguments: -PtestJdk8=true build --init-script build-scan-agree.gradle --scan --info --stacktrace
       - name: Upload Test Results and Reports
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: bitcoinj-core-test-results-jdk${{ matrix.java }}-${{ matrix.os }}
+          name: bitcoinj-core-test-results-jdk${{ matrix.java }}-${{ matrix.os }}-${{ matrix.gradle }}
           path: |
             core/build/reports/tests/test/
             core/build/test-results/test/