From 36bad69b314a1bdea1d32514c2693e6bcc197166 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 17 Jul 2021 14:06:28 +1000 Subject: [PATCH] CI: Don't try to make UWP app bundle on pull requests --- .github/workflows/rolling-release.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index 3e86a2f8d..13735ebaf 100644 --- a/.github/workflows/rolling-release.yml +++ b/.github/workflows/rolling-release.yml @@ -190,13 +190,22 @@ jobs: run: | nuget restore duckstation-uwp.sln - - name: Compile x64 release build + - name: Compile x64 release build without bundle + if: github.ref != 'refs/heads/master' && github.ref != 'refs/heads/dev' + shell: cmd + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 + msbuild duckstation-uwp.sln /p:Configuration="ReleaseUWP" /p:Platform="x64" /t:Build + + - name: Compile x64 release build with bundle + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 msbuild duckstation-uwp.sln /p:AppxBundle=Always /p:AppxPackageIsForStore=true /p:BuildAppxUploadPackageForUap=true /p:AppxBundlePlatforms="x64" /p:Configuration="ReleaseUWP" /p:Platform="x64" /t:Build - name: Grab AppX package + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' shell: cmd run: | copy build\ReleaseUWP-x64\duckstation-uwp\duckstation-uwp_1.0.0.0_Bundle\duckstation-uwp_1.0.0.0_x64_ReleaseUWP.appx duckstation-uwp.appx @@ -208,6 +217,7 @@ jobs: Get-PfxCertificate -FilePath .\src\duckstation-uwp\duckstation-uwp.pfx | Export-Certificate -FilePath duckstation-uwp.der -Type CERT - name: Upload AppX package + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' uses: actions/upload-artifact@v1 with: name: "windows-uwp"