chore: merge master to staging for Sprint B18S3

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on:
 jobs:
 
   build-test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       KEYMANHOSTS_TIER: TIER_TEST
 

.gitignore

@@ -10,6 +10,7 @@ vendor*
 # Shared files are bootstrapped:
 resources/bootstrap.inc.sh
 resources/.bootstrap-version
+resources/.bootstrap-registry
 _common/
 
 # State files

_includes/2020/KeymanComSentry.php

@@ -5,10 +5,15 @@
 
   use Keyman\Site\Common\KeymanSentry;
 
+  require_once(__DIR__ . '/../../_common/KeymanSentry.php');
+
   const SENTRY_DSN = 'https://[email protected]/5983516';
 
   class KeymanComSentry {
     static function init() {
       KeymanSentry::Init(SENTRY_DSN);
     }
+    static function GetBrowserHTML() {
+      return KeymanSentry::GetBrowserHTML(SENTRY_DSN);
+    }
   }

_includes/2020/templates/Head.php

@@ -4,8 +4,14 @@
   namespace Keyman\Site\com\keyman\templates;
 
 use Keyman\Site\com\keyman\Util;
+use Keyman\Site\com\keyman\KeymanComSentry;
 use Keyman\Site\Common\KeymanHosts;
 
+// *Don't* use autoloader here because of potential side-effects in older pages
+require_once(__DIR__ . '/../Util.php');
+require_once(__DIR__ . '/../KeymanComSentry.php');
+require_once(__DIR__ . '/../../../_common/KeymanHosts.php');
+
 class Head {
     static function render($fields = []) {
       $fields = (object)$fields;
@@ -44,31 +50,7 @@ static function render($fields = []) {
   }
 ?>
   <title><?= $fields->title; ?></title>
-  <script
-    src="https://js.sentry-cdn.com/bba22972ad6b4c2ab03a056f549cc23d.min.js"
-    crossorigin="anonymous"
-  ></script>
-  <script
-    src="https://browser.sentry-cdn.com/9.1.0/bundle.tracing.min.js"
-    integrity="sha384-MCeGoX8VPkitB3OcF9YprViry6xHPhBleDzXdwCqUvHJdrf7g0DjOGvrhIzpsyKp"
-    crossorigin="anonymous"
-  ></script>
-  <script
-    src="https://browser.sentry-cdn.com/9.1.0/captureconsole.min.js"
-    integrity="sha384-gkHY/HxnL+vrTN/Dn6S9siimRwqogMXpX4AetFSsf6X2LMQFsuXQGvIw7h2qWCt+"
-    crossorigin="anonymous"
-  ></script>
-  <script
-    src="https://browser.sentry-cdn.com/9.1.0/httpclient.min.js"
-    integrity="sha384-ZsomH91NyAZy+YSYhJcpL3sSDFlkL310CJnpKNqL9KerB92RvfsH9tXRa2youKLM"
-    crossorigin="anonymous"
-  ></script>
-  <script>
-    const sentryEnvironment = {
-      tier: '<?=KeymanHosts::Instance()->TierName()?>',
-    }
-  </script>
-  <script src="<?= Util::cdn('js/sentry.js'); ?>"></script>
+  <?= KeymanComSentry::GetBrowserHtml(); ?>
   <meta content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" name="viewport">
   <link rel='shortcut icon' href="<?= $fields->favicon; ?>">
   <?php foreach($fields->css as $cssFile) { ?>

_includes/includes/servervars.php

@@ -17,7 +17,6 @@
 */
 
   require_once __DIR__ . '/../../vendor/autoload.php';
-  require_once __DIR__ . '/../../_common/KeymanSentry.php';
   require_once __DIR__ . '/../2020/KeymanComSentry.php';
   Keyman\Site\com\keyman\KeymanComSentry::init();
 

build.sh

@@ -2,8 +2,8 @@
 ## START STANDARD SITE BUILD SCRIPT INCLUDE
 readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh"
-readonly BOOTSTRAP_VERSION=v0.18
-[ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh)
+readonly BOOTSTRAP_VERSION=v0.20
+[ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -H "Cache-Control: no-cache" -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh)
 ## END STANDARD SITE BUILD SCRIPT INCLUDE
 
 readonly KEYMAN_CONTAINER_NAME=keyman-website

contact/index.php

@@ -39,5 +39,7 @@
   <br/>
   7500 W Camp Wisdom Rd
   <br/>
-  Texas USA 75236
+  Dallas, TX 75236-5629
+  <br/>
+  USA
 </p>

resources/init-container.sh

@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+THIS_SCRIPT_PATH="$(dirname "$THIS_SCRIPT")"
+
 if [[ ! $1 =~ "debug" ]]; then
   echo "---- Generating CDN ---"
-  rm -rf cdn/deploy
-  cd cdn
+  rm -rf "$THIS_SCRIPT_PATH/../cdn/deploy"
+  cd "$THIS_SCRIPT_PATH/../cdn"
   php -d include_path=/var/www/html/_includes:. cdnrefresh.php
   cd ..
 else
   echo "Skip Generating CDN and clean CDN cache"
-  rm -rf cdn/deploy
+  rm -rf "$THIS_SCRIPT_PATH/../cdn/deploy"
 fi