> /usr/bin/bashwrapper
+uid=\$(stat -c "%u" /home/build/build)
+gid=\$(stat -c "%g" /home/build/build)
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+ echo "Adjusting build directory ownership to uid/gid \$(id -un):\$(id -gn)"
+ sudo chown -R build:build /home/build/build
+fi
+
if [[ "\$@" =~ test ]] && [ -f /usr/bin/run-tests.sh ]; then
/usr/bin/run-tests.sh "\${@:-bash}"
else
"\${@:-bash}"
fi
+
+if [[ "\${uid}" != "\$(id -u)" || "\${gid}" != "\$(id -g)" ]]; then
+ echo "Reverting build directory ownership to uid/gid \${uid}:\${gid}"
+ sudo chown -R \${uid}:\${gid} /home/build/build
+fi
EOF
# now, switch to build user
diff --git a/resources/teamcity/developer/keyman-developer-release.sh b/resources/teamcity/developer/keyman-developer-release.sh
index b24978de0d..7bf2e02553 100755
--- a/resources/teamcity/developer/keyman-developer-release.sh
+++ b/resources/teamcity/developer/keyman-developer-release.sh
@@ -41,7 +41,7 @@ cd "${KEYMAN_ROOT}/developer/src"
function _build_developer() {
builder_echo start "build developer" "Building Keyman Developer"
- ./build.sh configure build test api publish --npm-publish
+ ./build.sh configure build test api publish
builder_echo end "build developer" success "Finished building Keyman Developer"
}
diff --git a/resources/teamcity/developer/keyman-developer-test-windows.sh b/resources/teamcity/developer/keyman-developer-test-windows.sh
index 668e7a9c04..5bd7961c46 100755
--- a/resources/teamcity/developer/keyman-developer-test-windows.sh
+++ b/resources/teamcity/developer/keyman-developer-test-windows.sh
@@ -55,12 +55,12 @@ function _build_testkeyboards() {
}
function publish_sentry_action() {
- builder_echo start "publish" "Dry-run publish and api"
- ./build.sh api publish --dry-run
- builder_echo end "publish" "Dry-run publish and api"
+ builder_echo start "publish" "publish modules locally and prep api"
+ ./build.sh api publish
+ builder_echo end "publish" "publish modules locally and prep api"
builder_echo start "publish sentry" "Publishing debug information files to Sentry"
- # TODO: move this into build.sh publish? re-scope --dry-run into build.sh?
+ # TODO: move this into build.sh publish?
"${KEYMAN_ROOT}/developer/src/tools/sentry-upload-difs.sh"
builder_echo end "publish sentry" success "Finished publishing debug information files to Sentry"
}
diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index b2eed53d0a..0a3cd59173 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -41,7 +41,7 @@ GESTURE_PROCESSOR_BUILD="$KEYMAN_ROOT/web/src/engine/osk/gesture-processor/build
GESTURE_PROCESSOR_TARGET="$KEYMAN_ROOT/web/build/engine/gesture-processor/lib/"
function do_copy() {
- mkdir -p "$KEYMAN_ROOT/$DEST"
+ mkdir -p "$KEYMAN_ROOT/$DEST/keyboards"
# The next four lines are needed for the sentry-integration manual test page.
cp "$SENTRY_MANAGER_SRC" "$KEYMAN_ROOT/$DEST/sentry-manager.js"
@@ -49,6 +49,11 @@ function do_copy() {
mkdir -p "$GESTURE_PROCESSOR_TARGET"
cp -a "$GESTURE_PROCESSOR_BUILD" "$GESTURE_PROCESSOR_TARGET"
+
+ # copy common test (resources) keyboards
+ cp -f "$KEYMAN_ROOT/common/test/keyboards/platform-rules/platformtest.js" "$KEYMAN_ROOT/$DEST/keyboards/"
+ cp -f "$KEYMAN_ROOT/common/test/keyboards/test9469/build/test9469.js" "$KEYMAN_ROOT/$DEST/keyboards/"
+ cp -f "$KEYMAN_ROOT/common/test/resources/keyboards/"*.js "$KEYMAN_ROOT/$DEST/keyboards/"
}
builder_run_action clean rm -rf "$KEYMAN_ROOT/$DEST" && rm -rf "$GESTURE_PROCESSOR_TARGET"
diff --git a/web/src/test/manual/web/chirality/utilities.js b/web/src/test/manual/web/chirality/utilities.js
index 158a05c08e..16c9caaf02 100644
--- a/web/src/test/manual/web/chirality/utilities.js
+++ b/web/src/test/manual/web/chirality/utilities.js
@@ -7,7 +7,7 @@ function loadKeyboards()
languages:{
id:'en',name:'English',region:'North America'
},
- filename:'chirality.js'
+ filename:'../../../../../build/test-resources/keyboards/chirality.js'
});
// A testing keyboard using 10.0 format and the KLS layout specifier
diff --git a/web/src/test/manual/web/issue9469/index.html b/web/src/test/manual/web/issue9469/index.html
index 5db68244a2..78c3a15f95 100644
--- a/web/src/test/manual/web/issue9469/index.html
+++ b/web/src/test/manual/web/issue9469/index.html
@@ -40,7 +40,8 @@
kmw.init({
attachType:'auto'
}).then(function() {
- kmw.addKeyboards({id:'test9469',name:'test9469',languages:{id:'en',name:'English'}, filename:'test9469/build/test9469.js'});
+ kmw.addKeyboards({id:'test9469',name:'test9469',languages:{id:'en',name:'English'},
+ filename:'../../../../../build/test-resources/keyboards/test9469.js'});
var pageRef = (window.location.protocol == 'file:')
? window.location.href.substr(0, window.location.href.lastIndexOf('/')+1)
diff --git a/web/src/test/manual/web/platform/index.html b/web/src/test/manual/web/platform/index.html
index c528862ead..7f007561fd 100644
--- a/web/src/test/manual/web/platform/index.html
+++ b/web/src/test/manual/web/platform/index.html
@@ -53,12 +53,12 @@
KeymanWeb Sample Page - Platform Testing
- This page is designed to test the Platform statement for consistency.
- Refer to PR #969.
- See also /windows/src/test/manual-tests/platform-rules/platform-results.xlsx.
+
This page is designed to test the Platform statement for consistency.
+ Refer to PR #969.
+ See also /common/test/keyboards/platform-rules/platform-results.xlsx.
To run the test, just press [a]. This can be pasted into the above spreadsheet.
- Be sure to reference the developer console for additional feedback.
-
+ Be sure to reference the developer console for additional feedback.
+