From bed679d211e44e35296239edef78590bad93803e Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Mon, 3 Jun 2024 16:47:26 +1200
Subject: [PATCH] Update actions/upload-artifact to v4 (#257)

* Update actions/upload-artifact to v4

> actions/upload-artifact@v3 is scheduled for deprecation on **November 30, 2024**. [Learn more.](https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/)
> Similarly, v1/v2 are scheduled for deprecation on **June 30, 2024**.
> Please update your workflow to use v4 of the artifact actions.
> This deprecation will not impact any existing versions of GitHub Enterprise Server being used by customers.

* Fix amalgamated exe path

* Fix Android artifact upload

* Fix fix Android artifact upload
---
 .github/workflows/main.yml | 46 +++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f9bc8291..051381d0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,8 +22,9 @@ jobs:
         python amalgamate.py
         cd amalgamated
         cl.exe /std:c++17 /EHsc /utf-8 /Ox /I. /DPK_ENABLE_OS=1 main.cpp /link /out:pkpy.exe
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
+        name: amalgamated
         path: amalgamated/pkpy.exe
   build_win32:
     runs-on: windows-latest
@@ -33,12 +34,13 @@ jobs:
     - name: Compile
       shell: bash
       run: |
-        mkdir -p output/windows/x86_64
+        mkdir -p output/x86_64
         python cmake_build.py
-        cp main.exe output/windows/x86_64
-        cp pocketpy.dll output/windows/x86_64
-    - uses: actions/upload-artifact@v3
+        cp main.exe output/x86_64
+        cp pocketpy.dll output/x86_64
+    - uses: actions/upload-artifact@v4
       with:
+        name: windows
         path: output
     - name: Unit Test
       run: python scripts/run_tests.py
@@ -65,15 +67,16 @@ jobs:
       if: github.ref == 'refs/heads/main'
     - name: Compile
       run: |
-        mkdir -p output/linux/x86_64
+        mkdir -p output/x86_64
         python cmake_build.py
-        cp main output/linux/x86_64
-        cp libpocketpy.so output/linux/x86_64
+        cp main output/x86_64
+        cp libpocketpy.so output/x86_64
       env:
         CXX: clang++
         CC: clang
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
+        name: linux
         path: output
     - name: Benchmark
       run: python scripts/run_tests.py benchmark
@@ -111,8 +114,9 @@ jobs:
           mkdir -p output/macos
           xcodebuild clean build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
           cp -r build/Release/pocketpy.bundle output/macos
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: macos
           path: plugins/macos/pocketpy/output
   build_android:
       runs-on: ubuntu-latest
@@ -130,17 +134,18 @@ jobs:
           bash build_android.sh armeabi-v7a
           bash build_android.sh x86_64
 
-          mkdir -p output/android/arm64-v8a
-          mkdir -p output/android/armeabi-v7a
-          mkdir -p output/android/x86_64
+          mkdir -p output/arm64-v8a
+          mkdir -p output/armeabi-v7a
+          mkdir -p output/x86_64
 
-          cp build/android/arm64-v8a/libpocketpy.so output/android/arm64-v8a
-          cp build/android/armeabi-v7a/libpocketpy.so output/android/armeabi-v7a
-          cp build/android/x86_64/libpocketpy.so output/android/x86_64
+          cp build/android/arm64-v8a/libpocketpy.so output/arm64-v8a
+          cp build/android/armeabi-v7a/libpocketpy.so output/armeabi-v7a
+          cp build/android/x86_64/libpocketpy.so output/x86_64
         env:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: android
           path: output
   build_ios:
       runs-on: macos-latest
@@ -150,8 +155,9 @@ jobs:
         run: |
           git clone https://github.com/leetal/ios-cmake --depth 1 ~/ios-cmake
           bash build_ios.sh
-          mkdir -p output/ios
-          cp -r build/pocketpy.xcframework output/ios/pocketpy.xcframework
-      - uses: actions/upload-artifact@v3
+          mkdir -p output
+          cp -r build/pocketpy.xcframework output/pocketpy.xcframework
+      - uses: actions/upload-artifact@v4
         with:
+          name: ios
           path: output