erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix(windows): adjust symbol paths for publishing to symbol server

Browse source 
There were two issues arising from #15493 - first,
`$KEYMAN_SYMSTOREPATH` was set too late, after the build, and second,
symsrv renames `000admin` to `000Admin` but we need to keep it lowercase
for our deployment server, so rename it back just in time before
uploading.

As tidy-up, given that the folder name `000admin` is static and never
changes, removed the parameter and hard-coded it instead.

* export `$KEYMAN_SYMSTOREPATH` before build
* define `000admin` folder explicitly and deprecate --symbols-subdir parameter
* rename `000Admin` to `000admin` before upload

Fixes: #14837
Follows: #15493
Test-bot: skip
This commit is contained in:
Marc Durdin 2026-01-29 10:12:43 +11:00
parent 9b7777b7e2
commit 7b13f0fcbc
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/teamcity/developer/keyman-developer-release.sh
View file

@ -31,7 +31,7 @@ builder_describe \
"--help.keyman.com=HELP_KEYMAN_COM path to help.keyman.com repository" \
"--symbols-local-path=LOCAL_SYMBOLS_PATH local path to symbols directory" \
"--symbols-remote-path=REMOTE_SYMBOLS_PATH remote path to symbols directory" \
"--symbols-subdir=SYMBOLS_SUBDIR subdirectory containing symbols"
"--symbols-subdir=SYMBOLS_SUBDIR subdirectory containing symbols [unused; TODO: remove in v20]"
builder_parse "$@"
@ -118,7 +118,6 @@ function publish_action() {
export RSYNC_USER
export RSYNC_HOST
export RSYNC_ROOT
export KEYMAN_SYMSTOREPATH="$LOCAL_SYMBOLS_PATH"
_publish_sentry
ba_win_download_symbol_server_index
@ -127,6 +126,8 @@ function publish_action() {
tc_upload_help "api documentation" developer
}
export KEYMAN_SYMSTOREPATH="$LOCAL_SYMBOLS_PATH"
if builder_has_action all; then
build_developer_action
publish_action

14
resources/teamcity/includes/tc-windows.inc.sh
View file

@ -11,14 +11,14 @@ ba_win_download_symbol_server_index() {
builder_echo start "download symbol server index" "Downloading symbol server index"
(
# shellcheck disable=SC2154
mkdir -p "${LOCAL_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}"
mkdir -p "${LOCAL_SYMBOLS_PATH}/000admin"
# shellcheck disable=SC2164
cd "${LOCAL_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}"
cd "${LOCAL_SYMBOLS_PATH}/000admin"
# shellcheck disable=SC2154
tc_rsync_download "${REMOTE_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}/lastid.txt" "."
tc_rsync_download "${REMOTE_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}/history.txt" "."
tc_rsync_download "${REMOTE_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}/server.txt" "."
tc_rsync_download "${REMOTE_SYMBOLS_PATH}/000admin/lastid.txt" "."
tc_rsync_download "${REMOTE_SYMBOLS_PATH}/000admin/history.txt" "."
tc_rsync_download "${REMOTE_SYMBOLS_PATH}/000admin/server.txt" "."
)
builder_echo end "download symbol server index" success "Finished downloading symbol server index"
}
@ -32,6 +32,10 @@ ba_win_publish_new_symbols() {
(
# shellcheck disable=SC2164
cd "${LOCAL_SYMBOLS_PATH}"
# ensure lower case 000admin (it may become capitalized from symsrv touching it)
mv 000Admin 000admin
tc_rsync_upload "." "${REMOTE_SYMBOLS_PATH}"
)
builder_echo end "publish new symbols" success "Finished publishing new symbols to symbol server"

5
resources/teamcity/windows/keyman-windows-release.sh
View file

@ -33,7 +33,7 @@ builder_describe \
"--help.keyman.com=HELP_KEYMAN_COM path to help.keyman.com repository" \
"--symbols-local-path=LOCAL_SYMBOLS_PATH local path to symbols directory" \
"--symbols-remote-path=REMOTE_SYMBOLS_PATH remote path to symbols directory" \
"--symbols-subdir=SYMBOLS_SUBDIR subdirectory containing symbols"
"--symbols-subdir=SYMBOLS_SUBDIR subdirectory containing symbols [unused; TODO: remove in v20]"
builder_parse "$@"
@ -101,7 +101,6 @@ function windows_publish_action() {
export RSYNC_USER
export RSYNC_HOST
export RSYNC_ROOT
export KEYMAN_SYMSTOREPATH="$LOCAL_SYMBOLS_PATH"
builder_launch /windows/build.sh publish
windows_upload_symbols_to_sentry
@ -112,6 +111,8 @@ function windows_publish_action() {
builder_echo end "publish windows" success "Finished publishing Keyman for Windows"
}
export KEYMAN_SYMSTOREPATH="$LOCAL_SYMBOLS_PATH"
if builder_has_action all; then
windows_build_action
windows_test_action