Merge pull request #14128 from keymanapp/maint/web/14121_releasebld

ermshiperete · web-flow · commit 16557dd8eba4 · 2025-06-05T10:11:03.000+02:00
This fixes the Keyman for Web release builds - the script expects to be run from `${KEYMANROOT}/web`.
diff --git a/resources/teamcity/web/keyman-web-release.sh b/resources/teamcity/web/keyman-web-release.sh
@@ -58,9 +58,7 @@ function _zip_and_upload_artifacts() {
 
   builder_echo start "zip and upload artifacts" "Zipping and uploading artifacts"
 
-  cd "${KEYMAN_ROOT}/resources/teamcity/web"
   powershell -NonInteractive -ExecutionPolicy Bypass -File zip-and-upload-artifacts.ps1
-  cd "${KEYMAN_ROOT}/web"
 
   builder_echo end "zip and upload artifacts" success "Finished zipping and uploading artifacts"
 }
diff --git a/resources/teamcity/web/zip-and-upload-artifacts.ps1 b/resources/teamcity/web/zip-and-upload-artifacts.ps1
@@ -1,6 +1,8 @@
 #
 # This script should be the identical for nightly/beta/stable for a given platform
 #
+# Working directory should be ${KEYMAN_ROOT}/web
+#
 $ErrorActionPreference = "Stop";
 
 $tier = Get-Content ..\TIER.md

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,7 @@ function _zip_and_upload_artifacts() {`
`58`	`58`
`59`	`59`	`builder_echo start "zip and upload artifacts" "Zipping and uploading artifacts"`
`60`	`60`
`61`		`- cd "${KEYMAN_ROOT}/resources/teamcity/web"`
`62`	`61`	`powershell -NonInteractive -ExecutionPolicy Bypass -File zip-and-upload-artifacts.ps1`
`63`		`- cd "${KEYMAN_ROOT}/web"`
`64`	`62`
`65`	`63`	`builder_echo end "zip and upload artifacts" success "Finished zipping and uploading artifacts"`
`66`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`#`
`2`	`2`	`# This script should be the identical for nightly/beta/stable for a given platform`
`3`	`3`	`#`
	`4`	`+# Working directory should be ${KEYMAN_ROOT}/web`
	`5`	`+#`
`4`	`6`	`$ErrorActionPreference = "Stop";`
`5`	`7`
`6`	`8`	`$tier = Get-Content ..\TIER.md`