From dd750c98ceab1d511587edbceb78dbc5b7cfb15c Mon Sep 17 00:00:00 2001
From: Owen Avery <powerboat9.gamer@gmail.com>
Date: Thu, 23 Jan 2025 12:34:01 -0500
Subject: [PATCH] Update upload-artifact to v4

ChangeLog:

	* .github/workflows/ccpp.yml: Update actions/upload-artifact
	from v3 to v4, handle any artifact name conflicts.
	* .github/workflows/ccpp32alpine.yml: Likewise.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
---
 .github/workflows/ccpp.yml         | 20 ++++++++++----------
 .github/workflows/ccpp32alpine.yml |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 4e9a629fb027..bdc2d8df3e5e 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -80,9 +80,9 @@ jobs:
            cd gccrs-build; \
            make check-rust RUNTESTFLAGS="--target_board=unix\{-m64}"
     - name: Archive check-rust results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: check-rust-logs
+        name: check-rust-logs-ubuntu-64
         path: |
           gccrs-build/gcc/testsuite/rust/
     - name: Check regressions
@@ -165,9 +165,9 @@ jobs:
            cd gccrs-build; \
            make check-rust RUNTESTFLAGS="--target_board=unix\{-m64}"
     - name: Archive check-rust results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: check-rust-logs
+        name: check-rust-logs-ubuntu-64-glibcxx
         path: |
           gccrs-build/gcc/testsuite/rust/
     - name: Check regressions
@@ -249,9 +249,9 @@ jobs:
            cd gccrs-build; \
            make check-rust RUNTESTFLAGS="--target_board=unix\{-m32}"
     - name: Archive check-rust results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: check-rust-logs
+        name: check-rust-logs-ubuntu-32
         path: |
           gccrs-build/gcc/testsuite/rust/
     - name: Check regressions
@@ -350,7 +350,7 @@ jobs:
              make check-rust RUNTESTFLAGS="--target_board=unix\{-m32,-m64}"
 
     - name: Archive check-rust results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: check-rust-logs-5
         path: |
@@ -410,7 +410,7 @@ jobs:
   #          cd gccrs-build; \
   #          make check-rust
   #   - name: Archive check-rust results
-  #     uses: actions/upload-artifact@v3
+  #     uses: actions/upload-artifact@v4
   #     with:
   #       name: check-rust-logs-macos
   #       path: |
@@ -496,9 +496,9 @@ jobs:
            ASAN_OPTIONS=detect_leaks=0:use_odr_indicator=1 \
            make check-rust RUNTESTFLAGS="--target_board=unix\{-m64}"
     - name: Archive check-rust results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: check-rust-logs
+        name: check-rust-logs-asan
         path: |
           gccrs-build/gcc/testsuite/rust/
     - name: Check regressions
diff --git a/.github/workflows/ccpp32alpine.yml b/.github/workflows/ccpp32alpine.yml
index d4f6e04faac0..e2817d4f6cde 100644
--- a/.github/workflows/ccpp32alpine.yml
+++ b/.github/workflows/ccpp32alpine.yml
@@ -84,7 +84,7 @@ jobs:
            cat log_warnings
       shell: alpine.sh {0}
     - name: Archive warnings logs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: warnings 
         path: |
@@ -108,7 +108,7 @@ jobs:
       shell: alpine.sh {0}
 
     - name: Archive check-rust results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: check-rust-logs
         path: |