Merge pull request #55 from takano32/fix-github-actions-for-update-bu…

…ild-scripts Fix GitHub Actions for `Update build scripts`
RupertAvery · Oct 13, 2023 · 8167a50 · 8167a50
2 parents e47ae40 + 09eed0f
commit 8167a50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -25,7 +25,6 @@ jobs:
       - name: Tar linux-x64 files
         run: |
           cd build
-          mv {,psxpackager-}linux-x64
           tar cvf psxpackager-linux-x64{.tar,}
       - name: Upload linux-x64 Tar
         uses: actions/upload-artifact@v3
@@ -35,7 +34,6 @@ jobs:
       - name: Tar linux-arm files
         run: |
           cd build
-          mv {,psxpackager-}linux-arm
           tar cvf psxpackager-linux-arm{.tar,}
       - name: Upload linux-arm Tar
         uses: actions/upload-artifact@v3
@@ -45,7 +43,6 @@ jobs:
       - name: Tar linux-arm64 files
         run: |
           cd build
-          mv {,psxpackager-}linux-arm64
           tar cvf psxpackager-linux-arm64{.tar,}
       - name: Upload linux-arm64 Tar
         uses: actions/upload-artifact@v3
@@ -55,7 +52,6 @@ jobs:
       - name: Tar osx-x64 files
         run : |
           cd build
-          mv {,psxpackager-}osx-x64
           tar cvf psxpackager-osx-x64{.tar,}
       - name: Upload osx-x64 Tar
         uses: actions/upload-artifact@v3
@@ -65,7 +61,6 @@ jobs:
       - name: Tar osx-arm64 files
         run : |
           cd build
-          mv {,psxpackager-}osx-arm64
           tar cvf psxpackager-osx-arm64{.tar,}
       - name: Upload osx-arm64 Tar
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -16,12 +16,14 @@ jobs:
         with:
           msbuild-architecture: x64
 
+      - name: Install unzip
+        run: choco install -y zip
+
       - name: Test
         run: make test
 
       - name: Publish
-        # run: .\build-all.cmd
-        run: make
+        run: .\build-all.cmd
 
       - name: Upload PsxPackagerGUI Artifact
         uses: actions/upload-artifact@v3
@@ -32,5 +34,5 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: psxpackager-win-x64
-          path: build\win-x64\**
+          path: build\psxpackager-win-x64\**