From 3a2839840ef5c6556723520667bb6a24c6a24f8c Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gregory.szorc@gmail.com>
Date: Mon, 19 Feb 2024 12:00:44 -0800
Subject: [PATCH] ci: use upload-artifact@v4 for release publishing

We can no longer upload to the same named artifact across
multiple jobs. So we need to incorporate the build optimization level
into the artifact name.

I think release automation will continue to work since we iterate
over every artifact, download, and inspect the files within. But there
is a chance we need to tweak release automation to account for this
change.
---
 .github/workflows/apple.yml   | 4 ++--
 .github/workflows/linux.yml   | 4 ++--
 .github/workflows/windows.yml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml
index 4b7e4c8b..4d9921b8 100644
--- a/.github/workflows/apple.yml
+++ b/.github/workflows/apple.yml
@@ -195,9 +195,9 @@ jobs:
           ./build-macos.py --target-triple ${{ matrix.build.target_triple }} --python ${{ matrix.build.py }} --optimizations ${{ matrix.build.optimizations }}
 
       - name: Upload Distributions
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.build.py }}-${{ matrix.build.target_triple }}
+          name: ${{ matrix.build.py }}-${{ matrix.build.target_triple }}-${{ matrix.build.optimizations }}
           path: dist/*
 
       - uses: actions/checkout@v4
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index a19b33b3..f0a27960 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -947,7 +947,7 @@ jobs:
           build/pythonbuild validate-distribution ${EXTRA_ARGS} dist/*.tar.zst
 
       - name: Upload Distribution
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.build.py }}-${{ matrix.build.target_triple }}
+          name: ${{ matrix.build.py }}-${{ matrix.build.target_triple }}-${{ matrix.build.optimizations }}
           path: dist/*
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3c47496c..abb0bdfe 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -92,7 +92,7 @@ jobs:
           .\pythonbuild.exe validate-distribution --run $Dists
 
       - name: Upload Distributions
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.py }}-${{ matrix.vcvars }}
+          name: ${{ matrix.py }}-${{ matrix.vcvars }}-${{ matrix.profile }}
           path: dist/*