From d1aa1c077a664833e5412c9badeddccc44100318 Mon Sep 17 00:00:00 2001 From: TAKANO Mitsuhiro Date: Fri, 13 Oct 2023 17:26:32 +0900 Subject: [PATCH 1/5] Fix GitHub Actions for `Update build scripts` fix. e47ae409099da42ecd9857f5f672495755556213 --- .github/workflows/dotnet.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index e918dc2..81edb2d 100644 --- 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 From 655b5269dda0ff6a9dc6b4862c24d02f0b8b1cd6 Mon Sep 17 00:00:00 2001 From: TAKANO Mitsuhiro Date: Fri, 13 Oct 2023 17:29:17 +0900 Subject: [PATCH 2/5] Use `build-all.cmd` for `MSBuild` job --- .github/workflows/msbuild.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 65805f3..0752d02 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -20,8 +20,7 @@ jobs: run: make test - name: Publish - # run: .\build-all.cmd - run: make + run: .\build-all.cmd - name: Upload PsxPackagerGUI Artifact uses: actions/upload-artifact@v3 From e6cd17c732fd1902415d9f7d61f50c590c5fe3d0 Mon Sep 17 00:00:00 2001 From: TAKANO Mitsuhiro Date: Fri, 13 Oct 2023 17:32:21 +0900 Subject: [PATCH 3/5] GitHub Actions: fix artifact path --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 0752d02..16750aa 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -31,5 +31,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: psxpackager-win-x64 - path: build\win-x64\** + path: build\psxpackager-win-x64\** From 497746708a49d78083ebc3d33a179deb52d7e94e Mon Sep 17 00:00:00 2001 From: TAKANO Mitsuhiro Date: Fri, 13 Oct 2023 17:37:51 +0900 Subject: [PATCH 4/5] Install `unzip` with Chocolatey --- .github/workflows/msbuild.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 16750aa..214b791 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -16,6 +16,9 @@ jobs: with: msbuild-architecture: x64 + - name: Install unzip + run: choco install -y unzip + - name: Test run: make test From 09eed0f75a6ef49ef8f747c6039d1ddf5e5409b4 Mon Sep 17 00:00:00 2001 From: TAKANO Mitsuhiro Date: Fri, 13 Oct 2023 17:39:22 +0900 Subject: [PATCH 5/5] Install `zip` with Chocolatey --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 214b791..59811dc 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -17,7 +17,7 @@ jobs: msbuild-architecture: x64 - name: Install unzip - run: choco install -y unzip + run: choco install -y zip - name: Test run: make test