More workflow updates

4 files changed, 41 insertions, 25 deletions

diff --git a/.github/workflows/cmake_linux.yml b/.github/workflows/cmake_linux.yml
index 4c135722..f760f0c6 100644
--- a/.github/workflows/cmake_linux.yml
+++ b/.github/workflows/cmake_linux.yml
@@ -1,4 +1,4 @@
-name: Ubuntu
+name: Ubuntu Linux
 
 on:
   push:
@@ -16,7 +16,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
 
     - name: Installing Package Dependencies
       run: |
@@ -48,12 +49,13 @@ jobs:
     - name: Test
       run: sudo dpkg -i /tmp/fceux-*.deb
 
-    - uses: actions/upload-artifact@v2
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
       with:
-        name: Ubuntu build
+        name: fceux-ubuntu
         path: /tmp/fceux-*.deb
 
-    - name: Upload
+    - name: Upload to the site
       if: github.event_name != 'pull_request'
       run: |
         curl -F "file=@$(find /tmp -maxdepth 1 -name fceux-*.deb)" -F 'key=${{secrets.UPLOADER_KEY}}' -F 'name=fceux.deb' '${{secrets.UPLOADER_URL}}'
diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml
index ce7bec23..fcd41f99 100644
--- a/.github/workflows/cmake_macos.yml
+++ b/.github/workflows/cmake_macos.yml
@@ -20,7 +20,8 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
 
     - name: Installing Package Dependencies
       run: |
@@ -48,12 +49,13 @@ jobs:
       working-directory: build
       run: sudo cpack -G DragNDrop
 
-    - uses: actions/upload-artifact@v2
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
       with:
-        name: macOS build
+        name: fceux-macos
         path: build/fceux-*.dmg
 
-    - name: Upload
+    - name: Upload to the site
       if: github.event_name != 'pull_request'
       working-directory: build
       run: curl -F "file=@$(find . -maxdepth 1 -name fceux-*.dmg)" -F 'key=${{secrets.UPLOADER_KEY}}' -F 'name=fceux.dmg' '${{secrets.UPLOADER_URL}}'
diff --git a/.github/workflows/msbuild_win_x64.yml b/.github/workflows/msbuild_win_x64.yml
index 7dbdb98d..a150453d 100644
--- a/.github/workflows/msbuild_win_x64.yml
+++ b/.github/workflows/msbuild_win_x64.yml
@@ -1,4 +1,4 @@
-name: WinX64
+name: Windows (x64)
 
 on:
   push:
@@ -19,7 +19,8 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
@@ -27,7 +28,7 @@ jobs:
     - name: Build
       run: msbuild ${{env.SOLUTION_FILE_PATH}} /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{env.PLATFORM}}
 
-    - name: Archive
+    - name: Prepare directory
       working-directory: output
       run: |
         mkdir ${{env.OUTPUT_SUBDIRECTORY}}
@@ -41,14 +42,19 @@ jobs:
         move ..\src\drivers\win\7z_64.dll ${{env.OUTPUT_SUBDIRECTORY}}
         move fceux.chm ${{env.OUTPUT_SUBDIRECTORY}}
         move taseditor.chm ${{env.OUTPUT_SUBDIRECTORY}}
-        ..\vc\zip -X -9 -r ${{env.OUTPUT_FILE}} ${{env.OUTPUT_SUBDIRECTORY}}
 
-    - uses: actions/upload-artifact@v2
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
       with:
-        name: Windows (x64) build
-        path: output/${{env.OUTPUT_FILE}}
+        name: fceux-win64
+        path: output/${{env.OUTPUT_SUBDIRECTORY}}
+
+    - name: Archive
+      working-directory: output
+      run: |
+        ..\vc\zip -X -9 -r ${{env.OUTPUT_FILE}} ${{env.OUTPUT_SUBDIRECTORY}}
 
-    - name: Upload
+    - name: Upload to the site
       if: github.event_name != 'pull_request'
       working-directory: output
       run: curl -F 'file=@${{env.OUTPUT_FILE}}' -F 'key=${{secrets.UPLOADER_KEY}}' '${{secrets.UPLOADER_URL}}'
diff --git a/.github/workflows/msbuild_win_x86.yml b/.github/workflows/msbuild_win_x86.yml
index 3fa6e5ed..90c091f8 100644
--- a/.github/workflows/msbuild_win_x86.yml
+++ b/.github/workflows/msbuild_win_x86.yml
@@ -1,4 +1,4 @@
-name: WinX86
+name: Windows (x86)
 
 on:
   push:
@@ -19,7 +19,8 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
@@ -27,7 +28,7 @@ jobs:
     - name: Build
       run: msbuild ${{env.SOLUTION_FILE_PATH}} /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{env.PLATFORM}}
 
-    - name: Archive
+    - name: Prepare directory
       working-directory: output
       run: |
         mkdir ${{env.OUTPUT_SUBDIRECTORY}}
@@ -41,14 +42,19 @@ jobs:
         move 7z.dll ${{env.OUTPUT_SUBDIRECTORY}}
         move fceux.chm ${{env.OUTPUT_SUBDIRECTORY}}
         move taseditor.chm ${{env.OUTPUT_SUBDIRECTORY}}
-        ..\vc\zip -X -9 -r ${{env.OUTPUT_FILE}} ${{env.OUTPUT_SUBDIRECTORY}}
 
-    - uses: actions/upload-artifact@v2
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
       with:
-        name: Windows (x86) build
-        path: output/${{env.OUTPUT_FILE}}
+        name: fceux-win32
+        path: output/${{env.OUTPUT_SUBDIRECTORY}}
+
+    - name: Archive
+      working-directory: output
+      run: |
+        ..\vc\zip -X -9 -r ${{env.OUTPUT_FILE}} ${{env.OUTPUT_SUBDIRECTORY}}
 
-    - name: Upload
+    - name: Upload to the site
       if: github.event_name != 'pull_request'
       working-directory: output
       run: curl -F 'file=@${{env.OUTPUT_FILE}}' -F 'key=${{secrets.UPLOADER_KEY}}' '${{secrets.UPLOADER_URL}}'