From a79ca32cad7e82d2a06d28ba553741968e0c8d87 Mon Sep 17 00:00:00 2001 From: e Date: Fri, 4 Feb 2022 22:21:45 -0300 Subject: [PATCH] Installer CI: add Web component to releases --- .cirrus.yml | 9 +++++++++ Windows/Installer/ags.iss | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index c766fae77c..95cee2968f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -250,6 +250,7 @@ windows_packaging_task: - build_editor - build_windows - linux_packaging + - build_emscripten windows_container: dockerfile: ci/windows/Dockerfile os_version: 2019 @@ -282,6 +283,11 @@ windows_packaging_task: call Script\setvar.cmd ACI_VERSION_STR && cmd /v:on /c "curl -fLSs "https://api.cirrus-ci.com/v1/artifact/build/%CIRRUS_BUILD_ID%/linux_packaging/binaries/ags_!ACI_VERSION_STR!_linux.tar.gz" | tar -f - -xvC Windows\Installer\Source\Linux --strip-components 1" + get_emscripten_bundle_script: > + mkdir Windows\Installer\Source\Web && + call Script\setvar.cmd ACI_VERSION_STR && + cmd /v:on /c "curl -fLSs "https://api.cirrus-ci.com/v1/artifact/build/%CIRRUS_BUILD_ID%/build_emscripten/binaries/ags_!ACI_VERSION_STR!_web.tar.gz" | + tar -f - -xvC Windows\Installer\Source\Web --strip-components 1" make_installer_script: > powershell Windows\Installer\build.ps1 -IsccPath 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe' installer_artifacts: @@ -291,6 +297,7 @@ windows_packaging_task: move Windows\Installer\Source\Engine\* Windows\Installer\Source\Editor\ && move Windows\Installer\Source\Licenses Windows\Installer\Source\Editor\ && move Windows\Installer\Source\Linux Windows\Installer\Source\Editor\ && + move Windows\Installer\Source\Web Windows\Installer\Source\Editor\ && move Windows\Installer\Source\Templates Windows\Installer\Source\Editor\ && move Windows\Installer\Source\URLs Windows\Installer\Source\Editor\ && for %%f in (Windows\Installer\Output\*.exe) do @@ -361,6 +368,7 @@ make_release_task: - build_linux_debian - windows_packaging - linux_packaging + - build_emscripten - pdb_packaging container: image: alpine:3.10 @@ -390,6 +398,7 @@ make_release_task: for download in "windows_packaging/archive/$(basename AGS-*.exe .exe).zip" \ "windows_packaging/windevdependenciesvs/WinDevDependenciesVS.zip" \ "linux_packaging/binaries/ags_${version}_linux.tar.gz" \ + "build_emscripten/binaries/ags_${version}_web.tar.gz" \ "pdb_packaging/archive/AGS-${version}-pdb.zip" \ "build_linux_debian/debian_packages/ags_${version}_i386.deb" \ "build_linux_debian/debian_packages/ags_${version}_amd64.deb" \ diff --git a/Windows/Installer/ags.iss b/Windows/Installer/ags.iss index 6f3f862620..c1c0a66e23 100644 --- a/Windows/Installer/ags.iss +++ b/Windows/Installer/ags.iss @@ -52,6 +52,7 @@ ComponentMain=Main files ComponentEngines=Engines ComponentEngineDefault=Runtime engine for MS Windows ComponentLinuxBuild=Linux build component +ComponentWebBuild=Web build component ; ComponentDemoGame=Demo Game InstallOptions=Install options InstallVCRedist=Install {#VcRedistName} @@ -64,6 +65,7 @@ Name: "main"; Description: "{cm:ComponentMain}"; Types: full compact custom; Fla Name: "engine"; Description: "{cm:ComponentEngines}"; Types: full compact custom; Flags: fixed Name: "engine\default"; Description: "{cm:ComponentEngineDefault}"; Types: full compact; Flags: exclusive Name: "linux"; Description: "{cm:ComponentLinuxBuild}"; Types: full custom +Name: "web"; Description: "{cm:ComponentWebBuild}"; Types: full custom ; Name: "demogame"; Description: "{cm:ComponentDemoGame}"; Types: full custom @@ -111,6 +113,8 @@ Source: "Source\Linux\ags64"; DestDir: "{app}\Linux"; Flags: ignoreversion; Comp Source: "Source\Linux\lib32\*"; DestDir: "{app}\Linux\lib32"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: linux Source: "Source\Linux\lib64\*"; DestDir: "{app}\Linux\lib64"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: linux Source: "Source\Linux\licenses\*"; DestDir: "{app}\Linux\licenses"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: linux +; Web build components +Source: "Source\Web\*"; DestDir: "{app}\Web"; Flags: ignoreversion; Components: web ; Demo game ; Source: "Source\Demo Game\*"; DestDir: "{code:GetDemoGameDir}"; Flags: ignoreversion recursesubdirs createallsubdirs skipifsourcedoesntexist; Components: demogame ; Visual C++ runtime