From a35a61990338de64ba3703cd112a2643bc7d231d Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Sun, 8 Mar 2026 19:17:27 +0000
Subject: [PATCH] ci: Add version suffix to libretro archive filenames

---
 .ci/libretro-pack.sh           | 13 +++++++++++++
 .github/workflows/libretro.yml | 18 ++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100755 .ci/libretro-pack.sh

diff --git a/.ci/libretro-pack.sh b/.ci/libretro-pack.sh
new file mode 100755
index 000000000..d0a17a83e
--- /dev/null
+++ b/.ci/libretro-pack.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -ex
+
+# Determine the full revision name.
+GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
+GITREV="`git show -s --format='%h'`"
+
+REV_NAME="azahar-libretro-$OS-$TARGET-$GITDATE-$GITREV"
+if [ "$GITHUB_REF_TYPE" = "tag" ]; then
+    REV_NAME="azahar-libretro-$OS-$TARGET-$GITHUB_REF_NAME"
+fi
+
+# Create .zip
+zip -j -9 $REV_NAME.zip $BUILD_DIR/$EXTRA_PATH/azahar_libretro.*
diff --git a/.github/workflows/libretro.yml b/.github/workflows/libretro.yml
index 457056213..668afad70 100644
--- a/.github/workflows/libretro.yml
+++ b/.github/workflows/libretro.yml
@@ -41,7 +41,8 @@ jobs:
           export NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/$ANDROID_NDK_VERSION
           ${ANDROID_SDK_ROOT}/cmake/3.30.3/bin/cmake $CORE_ARGS -DANDROID_PLATFORM=android-$API_LEVEL -DCMAKE_TOOLCHAIN_FILE=$NDK_ROOT/build/cmake/android.toolchain.cmake -DANDROID_STL=c++_static -DANDROID_ABI=$ANDROID_ABI . -B $BUILD_DIR
           ${ANDROID_SDK_ROOT}/cmake/3.30.3/bin/cmake --build $BUILD_DIR --target azahar_libretro --config Release -j $(nproc)
-          zip -j -9 azahar-libretro-android-arm64.zip ${{ env.BUILD_DIR }}/${{ env.EXTRA_PATH }}/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
@@ -63,7 +64,8 @@ jobs:
         run: |
           cmake $CORE_ARGS $EXTRA_CORE_ARGS . -B $BUILD_DIR
           cmake --build $BUILD_DIR --target azahar_libretro --config Release -j $(nproc)
-          zip -j -9 azahar-libretro-linux-x86_64.zip ${{ env.BUILD_DIR }}/${{ env.EXTRA_PATH }}/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
@@ -93,7 +95,8 @@ jobs:
               bash -lc "\
                   ${CMAKE} $CORE_ARGS $EXTRA_CORE_ARGS . -B $BUILD_DIR && \
                   ${CMAKE} --build $BUILD_DIR --target azahar_libretro --config Release -j $(nproc)"
-                  zip -j -9 azahar-libretro-windows-x86_64.zip ${{ env.BUILD_DIR }}/${{ env.EXTRA_PATH }}/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
@@ -120,7 +123,8 @@ jobs:
         run: |
           cmake $CORE_ARGS -DCMAKE_OSX_ARCHITECTURES=$TARGET . -B $BUILD_DIR
           cmake --build $BUILD_DIR --target azahar_libretro --config Release
-          zip -j -9 azahar-libretro-macos-$TARGET.zip ${{ env.BUILD_DIR }}/${{ env.EXTRA_PATH }}/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
@@ -142,7 +146,8 @@ jobs:
         run: |
           cmake $CORE_ARGS $EXTRA_CORE_ARGS . -B $BUILD_DIR
           cmake --build $BUILD_DIR --target azahar_libretro --config Release
-          zip -j -9 azahar-libretro-ios.zip ${{ env.BUILD_DIR }}/${{ env.EXTRA_PATH }}/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
@@ -164,7 +169,8 @@ jobs:
         run: |
           cmake $CORE_ARGS $EXTRA_CORE_ARGS . -B $BUILD_DIR
           cmake --build $BUILD_DIR --target azahar_libretro --config Release
-          zip -j -9 azahar-libretro-tvos.zip ${{ env.BUILD_DIR }}/${{ env.EXTRA_PATH }}/azahar_libretro.*
+      - name: Pack
+        run: ./.ci/libretro-pack.sh
       - name: Upload
         uses: actions/upload-artifact@v4
         with: