workflow

amdf · Jan 18, 2025 · 9c47a9b · 9c47a9b
1 parent ed58945
commit 9c47a9b
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,19 +43,22 @@ jobs:
       run: |
         C:\WinDDK\7600.16385.1\bin\setenv.bat C:\WinDDK\7600.16385.1 fre x64 WIN7 && D: && cd ${{ github.workspace }}\srcdir && build /g /w
       shell: cmd
-    - name: Upload artifact x86
+    - name: Upload artifact i386
       uses: actions/upload-artifact@v4
       with:
-        name: nativeshell
+        name: nativeshell-i386
         path: |
           ${{ github.workspace }}\srcdir\objfre_wxp_x86\i386\native.exe
           ${{ github.workspace }}\srcdir\install\*
           ${{ github.workspace }}\srcdir\README.md
         retention-days: 1
-    - name: Upload artifact x64
+    - name: Upload artifact amd64
       uses: actions/upload-artifact@v4
       with:
-        name: nativeshell-x64-alpha
-        path: ${{ github.workspace }}\srcdir\objfre_win7_amd64\amd64\native.exe
+        name: nativeshell-amd64
+        path: |
+          ${{ github.workspace }}\srcdir\objfre_win7_amd64\amd64\native.exe
+          ${{ github.workspace }}\srcdir\install\*
+          ${{ github.workspace }}\srcdir\README.md
         retention-days: 1
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,15 +14,6 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: nativeshell
-      - name: Display structure of downloaded files
-        run: ls -R
-      - name: Prepare release artifact
-        run: |
-          zip -r --junk-paths nativeshell.zip ./*
       - name: Create release
         uses: actions/create-release@v1
         id: create_release
@@ -31,17 +22,43 @@ jobs:
           prerelease: false
           release_name: Release ${{ github.ref }}
           tag_name: ${{ github.ref }}
-          body: NT Native Executable and install files
+          body: NT native executable and install files
         env:
           GITHUB_TOKEN: ${{ github.token }}
-      - name: Upload release artifact
+      - name: Download i386 binary 
+        uses: actions/download-artifact@v4
+        working-directory: ${{ github.workspace }}/i386
+        with:
+          name: nativeshell-i386
+      - name: Prepare release i386 binary
+        working-directory: ${{ github.workspace }}/i386
+        run: |
+          zip -r --junk-paths nativeshell.zip ./*
+      - name: Release i386 binary 
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ github.workspace }}/nativeshell.zip
+          asset_path: ${{ github.workspace }}/i386/nativeshell.zip
           asset_name: nativeshell-${GITHUB_REF##*/}.i386.zip
           asset_content_type: application/zip
-
+      - name: Download amd64 binary 
+        uses: actions/download-artifact@v4
+        working-directory: ${{ github.workspace }}/amd64
+        with:
+          name: nativeshell-amd64
+      - name: Prepare release amd64 binary
+        working-directory: ${{ github.workspace }}/amd64
+        run: |
+          zip -r --junk-paths nativeshell.zip ./*
+      - name: Release amd64 binary 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ github.workspace }}/amd64/nativeshell.zip
+          asset_name: nativeshell-${GITHUB_REF##*/}.amd64.zip
+          asset_content_type: application/zip