From eabeda1a8438413be2f07c4e25a308e73318ccd7 Mon Sep 17 00:00:00 2001
From: Karin <beyondk2000@gmail.com>
Date: Wed, 6 Nov 2024 21:37:25 +0800
Subject: [PATCH] Update test.yml

---
 .github/workflows/test.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 544ee1c0d..66fc557a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -58,7 +58,7 @@ jobs:
         run: |
           echo ${{ github.workspace }} ${{ matrix.os }}-${{ matrix.bits }}
           if [ "x${{ matrix.bits }}" = "x32" ]; then echo "arch=86" >> "$GITHUB_OUTPUT"; else echo "arch=64" >> "$GITHUB_OUTPUT"; fi
-          if [ "x${{ matrix.os }}" = "xubuntu-latest" ]; then echo "os=linux" >> "$GITHUB_OUTPUT"; else echo "os=win" >> "$GITHUB_OUTPUT"; fi
+          if [ "x${{ matrix.os }}" = "xubuntu-latest" ]; then echo "os=linux" >> "$GITHUB_OUTPUT"; echo "archive=tar.gz" >> "$GITHUB_OUTPUT"; else echo "os=win" >> "$GITHUB_OUTPUT"; echo "archive=zip" >> "$GITHUB_OUTPUT"; fi
 
       - name: Get current date time
         id: current_datetime
@@ -112,8 +112,8 @@ jobs:
         if: matrix.os == 'windows-latest'
         uses: vimtor/action-zip@v1.2
         with:
-          files: windows_x${{ steps.strings.outputs.arch }}_release/
-          dest: idTech4A++-test_windows_x${{ steps.strings.outputs.arch }}_release-${{ steps.current_datetime.outputs.time }}.zip
+          files: ${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}_release/
+          dest: idTech4A++-test_${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}-${{ steps.current_datetime.outputs.time }}.zip
           recursive: false
 
       - name: run apt
@@ -145,13 +145,13 @@ jobs:
           #cp Q3E/src/main/jni/doom3/neo/${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}/Quake4 ${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}_release/
           #cp Q3E/src/main/jni/doom3/neo/${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}/Prey ${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}_release/
           dir ${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}_release
-          tar zcvf idTech4A++-test_${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}_release-${{ steps.current_datetime.outputs.time }}.tar.gz ${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}_release/
+          tar zcvf idTech4A++-test_${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}-${{ steps.current_datetime.outputs.time }}.tar.gz ${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}_release/
 
       - uses: actions/upload-artifact@v4
-        name: Upload Zip artifacts
+        name: Upload package archive artifacts
         with:
           name: "${{ matrix.os }}-${{ matrix.bits }}-release"
-          path: "idTech4A++-test_${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}_release-${{ steps.current_datetime.outputs.time }}.${{matrix.os == 'ubuntu' && 'tar.gz' || 'zip'}}"
+          path: "idTech4A++-test_${{ steps.strings.outputs.os }}_x${{ steps.strings.outputs.arch }}-${{ steps.current_datetime.outputs.time }}.${{ steps.strings.outputs.archive }}"
           retention-days: 1
 
   collect:
@@ -163,6 +163,10 @@ jobs:
         with:
           # path: packages
           merge-multiple: true
+          
+      - name: List all packages
+        run: |
+          ls --color;
 
       - name: Delete tag and release
         uses: dev-drprasad/delete-tag-and-release@v1.1
@@ -178,7 +182,7 @@ jobs:
           repo_token: "${{ secrets.TOKEN }}"
           automatic_release_tag: "windows_x64_testing"
           prerelease: true
-          title: "Windows x64 testing (Non-release. Automatic CI builds)"
+          title: "Windows/Linux x64 testing (Non-release. Automatic CI builds)"
           files: |
-            idTech4A++-test_windows_x64_release-${{ steps.current_datetime.outputs.time }}.zip
-            idTech4A++-test_windows_x86_release-${{ steps.current_datetime.outputs.time }}.zip
+            idTech4A++-test_win_x64-${{ steps.current_datetime.outputs.time }}.zip
+            idTech4A++-test_linux_x64-${{ steps.current_datetime.outputs.time }}.tar.gz