Merge pull request #10076 from keymanapp/chore/merge-master-into-epic…

…/linux-mcompile chore: merge master into epic/linux-mcompile
keymanapp · Nov 24, 2023 · f443506 · f443506
2 parents ab027e2 + ff6a9fc
commit f443506
Show file tree

Hide file tree

Showing 183 changed files with 6,017 additions and 3,444 deletions.
diff --git a/.github/workflows/deb-packaging.README.md b/.github/workflows/deb-packaging.README.md
@@ -14,9 +14,28 @@ You can manually trigger a deb-packaging action on GitHub, e.g. to test changes:
     --data "{ \"event_type\": \"deb-pr-packaging: master\", \
     \"client_payload\": { \
       \"buildSha\": \"$(git rev-parse refs/heads/master)\", \
-      \"headSha\": \"$(git rev-parse refs/heads/master)\", \
       \"branch\": \"master\", \
+      \"baseBranch\": \"master\",
+      \"baseRef\": \"$(git rev-parse refs/heads/master^)\",
+      \"user\": \"${USER}\",
       \"isTestBuild\": \"true\"}" \
     https://api.github.com/repos/<yourgithubname>/keyman/dispatches
+  ```
+
+  To trigger a build for PR #1234 in a branch `pr-1234` this would look similar
+  to this:
 
+  ```bash
+   curl --write-out '\n' --request POST \
+    --header "Accept: application/vnd.github+json" \
+    --header "Authorization: token $GITHUB_TOKEN" \
+    --data "{ \"event_type\": \"deb-pr-packaging: PR #1234\", \
+    \"client_payload\": { \
+      \"buildSha\": \"$(git rev-parse refs/heads/pr-1234)\", \
+      \"branch\": \"pr-1234\", \
+      \"baseBranch\": \"master\",
+      \"baseRef\": \"$(git rev-parse refs/heads/master)\",
+      \"user\": \"${USER}\",
+      \"isTestBuild\": \"true\"}" \
+    https://api.github.com/repos/<yourgithubname>/keyman/dispatches
   ```
diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
@@ -1,15 +1,16 @@
 name: "Ubuntu packaging"
-run-name: "Ubuntu packaging - ${{ github.event.client_payload.branch }} (branch ${{ github.head_ref }}), by @${{ github.actor }}"
+run-name: "Ubuntu packaging - ${{ github.event.client_payload.branch }} (branch ${{ github.event.client_payload.baseBranch }}), by @${{ github.event.client_payload.user }}"
 on:
   repository_dispatch:
     types: ['deb-release-packaging:*', 'deb-pr-packaging:*']
 
 # Input:
 # buildSha:    The SHA of the commit to build, e.g. of the branch or
-#              refs/pull/1234/merge for PR
-# headSha:     The SHA of the branch head. Same as buildSha for regular
-#              builds, SHA of refs/pull/1234/head for PRs
+#              refs/pull/1234/head for PR
 # branch:      The branch to build, for a PR in the form `PR-1234`
+# baseBranch:  For a PR the base branch, otherwise the same as `branch`
+# baseRef:     The ref of the previous commit. For a PR the same as `baseBranch`.
+# user:        The user that triggered the build or created the PR
 # isTestBuild: false for Releases, otherwise true
 
 env:
@@ -40,7 +41,7 @@ jobs:
         gh api \
           --method POST \
           -H "Accept: application/vnd.github+json" \
-          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.headSha }} \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.buildSha }} \
           -f state='pending' \
           -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
           -f description='Debian packaging started' \
@@ -236,6 +237,7 @@ jobs:
       uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
       with:
         ref: '${{ github.event.client_payload.buildSha }}'
+        fetch-depth: 0
 
     - name: Download Artifacts
       uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
@@ -251,10 +253,12 @@ jobs:
       run: |
         cd linux
         PKG_NAME=libkeymancore
-        SRC_PKG="${GITHUB_WORKSPACE}/artifacts/keyman-srcpkg/keyman_${{ needs.sourcepackage.outputs.VERSION }}-1.debian.tar.xz" \
-        BIN_PKG="${GITHUB_WORKSPACE}/artifacts/keyman-binarypkgs/${PKG_NAME}_${{ needs.sourcepackage.outputs.VERSION }}-1${{ needs.sourcepackage.outputs.PRERELEASE_TAG }}+jammy1_amd64.deb" \
-        PKG_VERSION="${{ needs.sourcepackage.outputs.VERSION }}" \
-        ./scripts/deb-packaging.sh --gha verify 2>> $GITHUB_STEP_SUMMARY
+        ./scripts/deb-packaging.sh \
+          --gha \
+          --bin-pkg "${GITHUB_WORKSPACE}/artifacts/keyman-binarypkgs/${PKG_NAME}_${{ needs.sourcepackage.outputs.VERSION }}-1${{ needs.sourcepackage.outputs.PRERELEASE_TAG }}+jammy1_amd64.deb" \
+          --git-sha "${{ github.event.client_payload.buildSha }}" \
+          --git-base "${{ github.event.client_payload.baseRef }}" \
+          verify 2>> $GITHUB_STEP_SUMMARY
 
     - name: Archive .symbols file
       uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
@@ -292,7 +296,7 @@ jobs:
         gh api \
           --method POST \
           -H "Accept: application/vnd.github+json" \
-          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.headSha }} \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.buildSha }} \
           -f state="$RESULT" \
           -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
           -f description="$MSG" \

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,67 @@
 # Keyman Version History
 
+## 17.0.216 alpha 2023-11-23
+
+* fix(common): kmx struct alignment (#9977)
+* fix(developer): vis kbd callbacks instead of throw (#9979)
+* fix(core): dx: ldml: startContext should be optional in ldml test data (#10021)
+* chore(windows): remove `wm_keymandebug` messages and functions (#10055)
+* chore(windows): remove legacy LoadKeyboard (#10057)
+* chore(windows): remove unused globals relating to old keyboard debugging (#10058)
+* chore(core): remove vkey output from kmx processor (#10060)
+* fix(web): app/webview did not clear deadkeys on context-reset (#10039)
+
+## 17.0.215 alpha 2023-11-22
+
+* feat(core): ldml marker normalization (#9761)
+* feat(core): ldml backspace transform (#9960)
+* feat(core): ldml tertiary reordering (#9962)
+* fix(web): fixes OSK viewport scaling on iOS devices (#10035)
+
+## 17.0.214 alpha 2023-11-20
+
+* fix(ios): fv: replace Zip framework to prevent crash on startup (#10018)
+
+## 17.0.213 alpha 2023-11-17
+
+* fix(linux): Fix packaging GHA (#10020)
+* fix(android): Always display HTML banner when suggestions aren't available (#9696)
+
+## 17.0.212 alpha 2023-11-16
+
+* chore(web): splits banner.ts into separate files per banner type (#9987)
+* refactor(web): inactive banner management (#9988)
+
+## 17.0.211 alpha 2023-11-15
+
+* fix(windows): setup.inf generation had whitespace (#10000)
+* feat(developer): Support v2.0 projects in TIKE (#9949)
+* feat(developer): New Project - Description field and tweaks (#9950)
+* chore(developer): hide 'Remove From Project' for v2.0 projects (#9956)
+* feat(developer): Support loading XML LDML keyboards in TIKE (#9963)
+* feat(developer): show .xml LDML keyboards in project (#9964)
+* fix(developer): kmc build ldml keyboard should create output folder (#9966)
+* fix(developer): Project upgrade messages now show in Messages panel (#9969)
+* feat(developer): Project Settings Form for 17.0+ projects (#9984)
+* chore(developer): only build source files (#9985)
+* chore(developer): manage SourcePath in project upgrade (#9986)
+* feat(developer): handle errors loading projects (#9989)
+* chore(developer): show only source path files in project views (#9995)
+* chore(developer): handle project version checks cleanly in kmc (#9996)
+* fix(common): dx: don't call exit(0) on failure (#10005)
+* fix(linux): Improve triggering of packaging GHA (#10009)
+* chore(web,developer): Move keymanweb-osk.ttf to common/resources (#9993)
+
+## 17.0.210 alpha 2023-11-14
+
+* docs(common): Update CODEOWNERS for web (#9997)
+* chore(core): Add additional API checks (#9867)
+
+## 17.0.209 alpha 2023-11-13
+
+* docs(windows): update meson and emscripten details (#9933)
+* fix(web): Increase size of spacebar text (#9954)
+
 ## 17.0.208 alpha 2023-11-08
 
 * fix(web): Fix clearing of deadkeys (#9944)

diff --git a/VERSION.md b/VERSION.md
@@ -1 +1 @@
-17.0.209
+17.0.217
diff --git a/android/KMAPro/kMAPro/src/main/assets/banner.html b/android/KMAPro/kMAPro/src/main/assets/banner.html
@@ -0,0 +1,11 @@
+<!-- Custom banner theme -->
+<div style="background: white; width: 100%; height: 100%; position: absolute; left: 0; top: 0; display: flex">
+
+  <!-- svg path is relative to assets/ folder -->
+  <img src="banner/keyman_banner.svg" style="height:60%; background: white; display: block; margin: auto 2%;">
+
+  <!-- Tri-color line -->
+  <div style='height: 7%; left: 0; position: absolute; bottom: 0; width: 56%; background: #F68924'></div>
+  <div style='height: 7%; left: 56%; position: absolute; bottom: 0; width: 23%; background: #CC3846'></div>
+  <div style='height: 7%; left: 79%; position: absolute; bottom: 0; width: 21%; background: #79C3DA'></div>
+</div>