From 1ca5e5681bcb6c7d50b90041520c69d005a474d9 Mon Sep 17 00:00:00 2001 From: Felipe Wannmacher Date: Mon, 17 Jan 2022 21:50:22 -0300 Subject: [PATCH] Added UWP to appveyor.yaml (#3959) --- .gitignore | 2 +- Packaging/xbox-one/build.bat | 4 +- appveyor-uwp.yml | 16 ----- appveyor.yml | 71 ++++++++++++++++------ uwp-project/Package.appxmanifest.template | 2 +- uwp-project/devilutionX_TemporaryKey.pfx | Bin 0 -> 2528 bytes 6 files changed, 56 insertions(+), 39 deletions(-) delete mode 100644 appveyor-uwp.yml create mode 100644 uwp-project/devilutionX_TemporaryKey.pfx diff --git a/.gitignore b/.gitignore index 118fbad3d..19826eb2b 100644 --- a/.gitignore +++ b/.gitignore @@ -455,4 +455,4 @@ uwp-project/Assets/data uwp-project/Assets/fonts uwp-project/Assets/gendata uwp-project/Assets/ui_art - +!uwp-project/devilutionX_TemporaryKey.pfx diff --git a/Packaging/xbox-one/build.bat b/Packaging/xbox-one/build.bat index 41ef72729..7c074b947 100644 --- a/Packaging/xbox-one/build.bat +++ b/Packaging/xbox-one/build.bat @@ -15,6 +15,4 @@ powershell "Get-Content ..\uwp-project\Package.appxmanifest.template | %% {$_ -r msbuild /p:Configuration=Release;Platform=x64;AppxBundle=Always;AppxBundlePlatforms=x64 ..\uwp-project\devilutionx.sln -powershell "Get-Childitem -Path uwp-project\AppxPackages, uwp-project\Release -Include Microsoft.VCLibs.x64.*.appx, devilutionX_*_x64.appx -File -Recurse | Copy-Item -Destination ..\Packaging\xbox-one" - -cd ..\Packaging\xbox-one +powershell "Get-Childitem -Path uwp-project\AppxPackages, uwp-project\Release -Include Microsoft.VCLibs.x64.*.appx, devilutionX_*_x64.appx -File -Recurse | Compress-Archive -DestinationPath ..\devilutionx.zip" diff --git a/appveyor-uwp.yml b/appveyor-uwp.yml deleted file mode 100644 index eb9fcdd0f..000000000 --- a/appveyor-uwp.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: 1.0.{build} - -pull_requests: - do_not_increment_build_number: true -image: Visual Studio 2022 - -before_build: - - cd %APPVEYOR_BUILD_FOLDER%\Packaging\xbox-one - -build_script: - - build.bat -artifacts: - - path: . - name: devilutionX_*_x64.appx - - path: . - name: Microsoft.VCLibs.x64.*.appx diff --git a/appveyor.yml b/appveyor.yml index fb270c216..162357107 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,21 +2,56 @@ version: 1.0.{build} pull_requests: do_not_increment_build_number: true -image: Visual Studio 2022 -cache: '%LOCALAPPDATA%\vcpkg\archives' - -install: - - cd C:\Tools\vcpkg - - git pull - - .\bootstrap-vcpkg.bat - - cd %APPVEYOR_BUILD_FOLDER% - -before_build: - - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake . - -build: - project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln - verbosity: minimal -artifacts: - - path: Debug\devilutionx.exe - name: devilutionx.exe +environment: + matrix: + + - job_name: windows + appveyor_build_worker_image: Visual Studio 2022 + + - job_name: uwp + appveyor_build_worker_image: Visual Studio 2022 + +for: + - + matrix: + only: + - job_name: windows + + cache: '%LOCALAPPDATA%\vcpkg\archives' + + install: + - if not exist C:\Tools\vcpkg mkdir C:\Tools\vcpkg + - cd C:\Tools\vcpkg + - git pull + - .\bootstrap-vcpkg.bat + - cd %APPVEYOR_BUILD_FOLDER% + + before_build: + - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake . + + build: + project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln + verbosity: minimal + + artifacts: + - path: Debug\devilutionx.exe + name: devilutionx.exe + + - + matrix: + only: + - job_name: uwp + + before_build: + - cd %APPVEYOR_BUILD_FOLDER%\Packaging\xbox-one + - if exist ..\..\build rd /s /q ..\..\build + + build_script: + - build.bat + + after_build: + - cd %APPVEYOR_BUILD_FOLDER% + + artifacts: + - path: devilutionx.zip + name: devilutionx.zip diff --git a/uwp-project/Package.appxmanifest.template b/uwp-project/Package.appxmanifest.template index bed983668..761e49d72 100644 --- a/uwp-project/Package.appxmanifest.template +++ b/uwp-project/Package.appxmanifest.template @@ -9,7 +9,7 @@ + Version="__PROJECT_VERSION__.0" /> diff --git a/uwp-project/devilutionX_TemporaryKey.pfx b/uwp-project/devilutionX_TemporaryKey.pfx new file mode 100644 index 0000000000000000000000000000000000000000..9db4858e061e5b5c50446534202cd36ed05e2f27 GIT binary patch literal 2528 zcmZXUc|6qH8^^!17+ELRdX=S1*)`J)gG9EAjB8;Uw_r89=dtblT?~mu4&+~ph&pGFx^B~A9Ghh$|L1syVu}DW;i`eA= zF@ti+EYVOhOE?2RM39;2|5IXGgOZt67vXZGHhN$VQ>>d!rYqW6`T zqTZFIo;m;J%7Mj>`yRwdr=PsS(L?VLDEauS*>^vbT(&&g(fW#1%-ewz>Js&I>i^|{NQ)n<8km7HcK=vZh5 zj2xx<@Mhtmg8~Yi+bPt%1i1L{vv(n05bTCUE628|`kVSHZUZsPlQ|gf892)NHm%K47 z-=@Z@mX&ZHrOQLgE#wxt@lEZv{P-xBnz~`PyzBD4senuZUH??0YQm4j7-Y|Hi4)_HA;cyX?h$)nbKb^1$c;JAdO zf9V71nA@0d1N1cy;jlAK-$8x)t9b$RAa7o){;$97)x`x|)j~JqWZjZ@L<)ODS0t9OnGHr+4Vz_r#%M3`0* z=JUYg#S+B<7PHx%G>!f2=i~i~MmldE&IPfShjVZHnM&{{9tdu-1$x863_Yh`N@Uv$ zi#?w&b=-F?t`qRBx!LZIuU|R9;G?8y3n_>4cPp#Xdi#_^@6_0`swR%9TEt8{YNU{4 z%32RF6j{%LOQ&@|zTRkb3i2J2TEJsAY zy8H>uHygiiKmhX1a ze*XT>>pyUC1SHlW#!=C>k+qKwepGi86538l6nw@T(+sUX>!&Q5-B2)pEp%DUrNzIg z#sn_iqTW}&?r-QNNq|()w#Mq_7eo{YHnjFEN}$Ej^{=anS3AC~gneNd^5dH*O1e&r zZC}iINZ-%c?ToxXVBJum2TP+8BTug1#TkuG*zkxa^>bBf2_+GuiPEnY2Oow94CUHy zQiLsupIW|~i{?is2JgLnZ|}k05~_Mfq#S7>MtgByR|tlXv*T!E$`KOsFdL+P@o%r^ zW5JS#x>q$gAet9&=85R_$hBCmhP~-CL?7#N9zw59Szcp&vZc~|T!$l1(e5If!!T&j zlVW$8&k(Vo`Dsb~$&D+8@Mm}!jY1KpE{|Muw0NUm>{v8J8@)NEj3f0ssJE_Alf?>Iq*1YylLYz=#Wg9iRv(0djyn zfMkRML!p7&45G|XwhV=2xa0uL-) zI5V0&0XM*l5k$Zn5Cx1G>tBQfI5ILVhV}#88O)85donI@2b})y5(V&o`+OLgJ>UR% zBFK>7e_qZE%OykH8ORk30vMaazZKB`kNomWxF1#n`tSZ4`5|P8(p$FkhB#>WH2o~r zL`DAb`Ns*6ttHVL30iw|XD$t{&+`l7XQ)|k(f~b!3}N>A9o`?~M16c(}n3u}%2I*oF6*?g6S9mc<9YDO=?sQ`Ev>{no>w)g8p0nT3FC zj8?5s$_QVlQOV2Z+f_kp;NK?MY0<%VHXKcoXy*fj9C~8HE-W&vse@8?q%^`G@k^8Ga}|h< zEZFOmd)Ata&*e(JKI3OMI0avplH5em8AIhoOH#yq&Set`N8?zzn<8Oo(H>?cJ{9h= zr)&Ky+~a$*_uZBPc|3o0`F_&4rv^>Rsh}H?-_XcBT;4;^=h&4~l;u@eOGnXdaIzuE z7HpN5nQSjR*8C*wTQd+>w&|xd)hkw!P~=xF-4<_M`o@JKiR5J|x^*=|koHTEW2OH- zyj2dWL#1cg$c8=0PF=q*<1%@+Mny<8fvQHVJ6ucm5tAV0+poTz@T|>`+c%!@c|2H5 z@Y)gPp7)<3@HfWi)nr^T&^6JNlwsFc+k6}DJDJHeQ+*K=TDm8+!k-+Sge4K|KlT=k zA^T0m<5M+1Ge43-^`4@3&zc0fJ#7cE>KImzfQw6bKOin5L=em{CK*l$SP;s?F3qLw tF0twGi-&ilYMwxQPoWhK%0n_B)@{l*?QO~3TT~DZw6pUr<@xL5{Rv9sfk6NO literal 0 HcmV?d00001