Merge remote-tracking branch 'origin/master' into chore/merge-beta-to…

…-master-b17s5
keymanapp · Apr 12, 2024 · d6ee7f5 · d6ee7f5
2 parents ab0d225 + 93dc41e
commit d6ee7f5
Show file tree

Hide file tree

Showing 18 changed files with 340 additions and 106 deletions.
diff --git a/.github/actions/build-binary-packages/action.yml b/.github/actions/build-binary-packages/action.yml
@@ -31,7 +31,7 @@ runs:
         path: artifacts/keyman-srcpkg
 
     - name: Build
-      uses: sillsdev/gha-ubuntu-packaging@1f4b7e7eacb8c82a4d874ee2c371b9bfef7e16ea # v1.0
+      uses: sillsdev/gha-ubuntu-packaging@7b56f50d5d5537e9e9cafd3f6139ec6da69cfcda # v1.1
       with:
         dist: "${{ inputs.dist }}"
         platform: "${{ inputs.arch }}"

diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
@@ -1,5 +1,5 @@
 name: "Ubuntu packaging"
-run-name: "Ubuntu packaging - ${{ github.event.client_payload.branch }} (branch ${{ github.event.client_payload.baseBranch }}), by @${{ github.event.client_payload.user }}"
+run-name: "Ubuntu packaging - ${{ github.event.client_payload.branch }} (branch ${{ github.event.client_payload.baseBranch }}), by @${{ github.event.client_payload.user }}, testbuild: ${{ github.event.client_payload.isTestBuild }}"
 on:
   repository_dispatch:
     types: ['deb-release-packaging:*', 'deb-pr-packaging:*']
@@ -30,7 +30,7 @@ jobs:
       PRERELEASE_TAG: ${{ steps.prerelease_tag.outputs.PRERELEASE_TAG }}
     steps:
     - name: Checkout
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
       with:
         ref: '${{ github.event.client_payload.buildSha }}'
 
@@ -112,13 +112,19 @@ jobs:
   binary_packages_released:
     name: Build binary packages for released versions
     needs: sourcepackage
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:
         dist: [focal, jammy, mantic]
 
-    runs-on: ubuntu-latest
     steps:
+    - name: Checkout
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      with:
+        ref: '${{ github.event.client_payload.buildSha }}'
+        sparse-checkout: '.github/actions/'
+
     - name: Build
       uses: ./.github/actions/build-binary-packages
       with:
@@ -128,6 +134,23 @@ jobs:
         deb_fullname: ${{env.DEBFULLNAME}}
         deb_email: ${{env.DEBEMAIL}}
 
+  binary_packages_unreleased:
+    name: Build binary packages for next Ubuntu version
+    needs: sourcepackage
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        dist: [noble]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      with:
+        ref: '${{ github.event.client_payload.buildSha }}'
+        sparse-checkout: '.github/actions/'
+
   binary_packages_unreleased:
     name: Build binary packages for next Ubuntu version
     needs: sourcepackage
@@ -139,7 +162,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Build
-      continue-on-error: true
       uses: ./.github/actions/build-binary-packages
       with:
         dist: ${{ matrix.dist }}
@@ -182,7 +204,7 @@ jobs:
     needs: [sourcepackage, binary_packages_released, binary_packages_unreleased]
     runs-on: ubuntu-latest
     environment: "deploy (linux)"
-    if: github.event.client_payload.isTestBuild == 'false'
+    if: ${{always() && needs.sourcepackage.result == 'success' && needs.binary_packages_released.result == 'success' && github.event.client_payload.isTestBuild == 'false'}}
 
     steps:
       - name: Sign packages
@@ -305,7 +327,9 @@ jobs:
     - name: Verify API
       run: |
         cd linux
-        PKG_NAME=libkeymancore
+        # Extract line containing "Package: libkeymancore1" and then strip "Package: "
+        PKG_NAME=$(grep -E 'Package: libkeymancore([0-9]+|$)' debian/control)
+        PKG_NAME="${PKG_NAME#Package: }"
         ./scripts/deb-packaging.sh \
           --gha \
           --bin-pkg "${GITHUB_WORKSPACE}/artifacts/${PKG_NAME}_${{ needs.sourcepackage.outputs.VERSION }}-1${{ needs.sourcepackage.outputs.PRERELEASE_TAG }}+jammy1_amd64.deb" \

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,80 @@
 # Keyman Version History
 
+## 18.0.17 alpha 2024-04-05
+
+* chore(linux): Show failed job for next Ubuntu version as failed (#11168)
+
+## 18.0.16 alpha 2024-04-04
+
+* chore(linux): Revert "Ignore failed package builds differently" (#11157)
+* chore(linux): Sign packages even if build for next Ubuntu fails (#11163)
+
+## 18.0.15 alpha 2024-04-03
+
+* chore(linux): Build packages for next Ubuntu version separately (#11145)
+* chore(linux): Fix typo in path of `build-binary-packages` action (#11154)
+* chore(linux): More fixes for workaround for failing linux builds (#11156)
+
+## 18.0.14 alpha 2024-04-02
+
+* chore(linux): Update debian changelog (#11097)
+
+## 18.0.13 alpha 2024-03-29
+
+* chore(deps): bump express from 4.17.3 to 4.19.2 (#11103)
+
+## 18.0.12 alpha 2024-03-28
+
+* chore(common): Merge beta to master for Sprint B17S4 (#11105)
+
+## 18.0.11 alpha 2024-03-20
+
+* chore(deps-dev): bump follow-redirects from 1.15.4 to 1.15.6 (#11010)
+
+## 18.0.10 alpha 2024-03-16
+
+* chore: Merge beta to master for Sprint B17S3 (#11008)
+
+## 18.0.9 alpha 2024-03-05
+
+* chore: B17S2 merge beta to master (#10909)
+
+## 18.0.8 alpha 2024-03-04
+
+* chore(linux): Update debian changelog (#10898)
+
+## 18.0.7 alpha 2024-02-29
+
+* chore: Merge 17.0.270 beta back to master (#10886)
+
+## 18.0.6 alpha 2024-02-27
+
+* chore(linux): Temporarily disable autopkgtests gha (#10853)
+* chore(linux): Update debian changelog (#10827)
+
+## 18.0.5 alpha 2024-02-26
+
+* fix(linux): Dynamically get package name (#10826)
+* chore(linux): Add running autopkgtests on GHA (#10823)
+* fix(linux): Fix autopkgtest gha (#10849)
+
+## 18.0.4 alpha 2024-02-23
+
+* chore(linux): Update debian changelog (#10786)
+
+## 18.0.3 alpha 2024-02-21
+
+* chore(deps): bump ip from 2.0.0 to 2.0.1 (#10792)
+
+## 18.0.2 alpha 2024-02-20
+
+* chore(linux): Add testbuild info to workflow title (#10771)
+
+## 18.0.1 alpha 2024-02-15
+
+* chore(common): move to 18.0 alpha (#10713)
+* chore: move to 18.0 alpha
+
 ## 17.0.306 beta 2024-04-11
 
 * docs(ios): updates iOS app help for 17.0 banner changes (#11200)
@@ -8,9 +83,9 @@
 ## 17.0.305 beta 2024-04-10
 
 *  (#11169)
-* change(web): merges split async method in gesture engine 🪠 (#11142)
+* change(web): merges split async method in gesture engine (#11142)
 * fix(web): blocks nextLayer for keys quickly typed when multitapping to new layer when final tap is held (#11189)
-* refactor(web): OSK spacebar-label updates now managed by layer object 🪠 (#11175)
+* refactor(web): OSK spacebar-label updates now managed by layer object (#11175)
 
 ## 17.0.304 beta 2024-04-09
 
@@ -37,7 +112,7 @@
 * change(web): input-event sequentialization 🪠 (#10843)
 * fix(web): proper linkage of sources to events 🪠 (#10960)
 * fix(developer): handle buffer boundaries in four cases (#11137)
-* chore(linux): Build packages for next Ubuntu version separately :cherries: (#11153)
+* chore(linux): Build packages for next Ubuntu version separately (#11153)
 * fix(common): upgrade sentry-cli to 2.31.0 (#11151)
 * fix(android/app): Track previous device orientation for SystemKeyboard (#11134)
 *  (#11129)
@@ -74,6 +149,7 @@
 * feat(developer/compilers): better unit test for suggestion accessibility (#11085)
 * fix(core): fix pointer math in actions_normalize() (#11101)
 
+
 ## 17.0.296 beta 2024-03-27
 
 * fix(developer): in model compiler, give correct key to shorter prefix words when a longer, higher-frequency word is also present (#11074)

diff --git a/TIER.md b/TIER.md
@@ -1 +1 @@
-beta
+alpha
diff --git a/VERSION.md b/VERSION.md
@@ -1 +1 @@
-17.0.307
+18.0.18
diff --git a/android/help/about/whatsnew.md b/android/help/about/whatsnew.md
@@ -1,15 +1,5 @@
 ---
 title: What's New
 ---
-Here are some of the new features we have added to Keyman 17.0 for Android:
 
-* New gesture support (#5029)
-* Better use of space for predictions, better handling for long predictions (#7934)
-* When suggestions aren't enabled, display a themed banner (#9696)
-* Smoother keyboard initialization (#10022)
-
-Additional changes:
-
-* Remove built-in browser (#8428)
-* Use web-based popup key longpresses (#9591)
-* Performance improvements
+Here are some of the new features we have added to Keyman 18.0 for Android:
diff --git a/android/help/index.md b/android/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for Android 17.0 Help
+title: Keyman for Android 18.0 Help
 ---
 
 ## [About Keyman](about/)

diff --git a/developer/src/server/package.json b/developer/src/server/package.json
@@ -12,7 +12,7 @@
     "@keymanapp/developer-utils": "*",
     "@sentry/node": "^7.57.0",
     "chalk": "^4.1.2",
-    "express": "^4.17.2",
+    "express": "^4.19.2",
     "multer": "^1.4.5-lts.1",
     "ngrok": "^5.0.0-beta.2",
     "open": "^8.4.0",

diff --git a/ios/help/about/whatsnew.md b/ios/help/about/whatsnew.md
@@ -1,12 +1,7 @@
 ---
 title: What's New
 ---
-Here are some of the new features we have added to Keyman 17.0 for iPhone and iPad:
-
-* New gesture support (#5029)
-* Better use of space for predictions, better handling for long predictions (#7934)
-* When suggestions aren't enabled, display a themed banner (#9696)
-* Smoother keyboard initialization (#10022)
+Here are some of the new features we have added to Keyman for iPhone and iPad 18.0:
 
 Additional changes:
 

diff --git a/ios/help/index.md b/ios/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for iPhone and iPad 17.0 Help
+title: Keyman for iPhone and iPad 18.0 Help
 ---
 
 ## [About Keyman](about/)

diff --git a/linux/debian/changelog b/linux/debian/changelog
@@ -15,6 +15,12 @@ keyman (17.0.279-1) unstable; urgency=medium
 
  -- Eberhard Beilharz <[email protected]>  Thu, 29 Feb 2024 19:17:08 +0100
 
+keyman (17.0.274-2) UNRELEASED; urgency=medium
+
+  * Add libicu-dev dependency to libkeymancore-dev (closes: #1064915)
+
+ -- Eberhard Beilharz <[email protected]>  Wed, 28 Feb 2024 17:54:58 +0100
+
 keyman (17.0.274-1) unstable; urgency=medium
 
   * Fix autopkg tests

diff --git a/linux/help/about/whatsnew.md b/linux/help/about/whatsnew.md
@@ -2,7 +2,7 @@
 title: What's New
 ---
 
-Here are some of the new features we have added to Keyman for Linux 17.0:
+Here are some of the new features we have added to Keyman for Linux 18.0:
 
 - Keyman for Linux now fully works with the Wayland compositor
   ([#4273](https://github.com/keymanapp/keyman/issues/4273)).

diff --git a/linux/help/index.md b/linux/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for Linux 17.0 Help
+title: Keyman for Linux 18.0 Help
 ---
 
 Need help using Keyman for Linux? In time, this product documentation will grow and explain frequently asked questions.

diff --git a/mac/help/about/whatsnew.md b/mac/help/about/whatsnew.md
@@ -2,7 +2,7 @@
 title: What's New
 ---
 
-Here are some of the new features we have added to Keyman 17.0 for macOS:
+Here are some of the new features we have added to Keyman 18.0 for macOS:
 
 * Keyman Engine for macOS now uses Keyman Core for processing keystrokes, improving reliability and consistency with the Linux and Windows versions of Keyman (#10066)
 * List of Keyman keyboards has been moved out of a submenu of the main Input Menu into the Keyman section of the menu (#9777)
diff --git a/mac/help/index.md b/mac/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman 17.0 for macOS Help
+title: Keyman 18.0 for macOS Help
 ---
 
 Need help using Keyman for macOS?  You'll find everything you need here, including product documentation,