chore(common): Merge beta to master Sprint b17s4

keymanapp · Mar 28, 2024 · c8395c4 · c8395c4
2 parents d517b36 + acc38fe
commit c8395c4
Show file tree

Hide file tree

Showing 16 changed files with 109 additions and 39 deletions.
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:*']
@@ -152,6 +152,35 @@ jobs:
           !artifacts/keyman-srcpkg/
       if: always()
 
+  autopkg_test:
+    name: Run autopkgtests
+    needs: [binary_packages]
+    runs-on: ubuntu-latest
+
+    steps:
+    # - name: Download Artifacts
+    #   uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
+    #   with:
+    #     path: artifacts
+    #     merge-multiple: true
+
+    # - name: Install dependencies
+    #   run: |
+    #     sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install autopkgtest qemu-system qemu-utils autodep8 genisoimage python3-distro-info
+
+    # - name: Build test image
+    #   run: |
+    #     cd "${GITHUB_WORKSPACE}/artifacts"
+    #     autopkgtest-buildvm-ubuntu-cloud -v --release=jammy
+
+    # - name: Run tests
+    #   run: |
+    #     cd "${GITHUB_WORKSPACE}/artifacts"
+    #     autopkgtest -B *.deb keyman_*.dsc -- qemu autopkgtest-jammy-amd64.img
+    - name: Ignore
+      run: |
+        echo "Ignored for now - until working solution is in place"
+
   deb_signing:
     name: Sign source and binary packages
     needs: [sourcepackage, binary_packages]
@@ -280,7 +309,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" \
@@ -297,24 +328,24 @@ jobs:
 
   set_status:
     name: Set result status on PR builds
-    needs: [sourcepackage, binary_packages, api_verification]
+    needs: [sourcepackage, binary_packages, api_verification, autopkg_test]
     runs-on: ubuntu-latest
     if: ${{ always() && github.event.client_payload.isTestBuild == 'true' }}
     steps:
     - name: Set success
-      if: needs.sourcepackage.result == 'success' && needs.binary_packages.result == 'success' && needs.api_verification.result == 'success'
+      if: needs.sourcepackage.result == 'success' && needs.binary_packages.result == 'success' && needs.api_verification.result == 'success' && needs.autopkg_test.result == 'success'
       run: |
         echo "RESULT=success" >> $GITHUB_ENV
         echo "MSG=Package build succeeded" >> $GITHUB_ENV
 
     - name: Set cancelled
-      if: needs.sourcepackage.result == 'cancelled' || needs.binary_packages.result == 'cancelled' || needs.api_verification.result == 'cancelled'
+      if: needs.sourcepackage.result == 'cancelled' || needs.binary_packages.result == 'cancelled' || needs.api_verification.result == 'cancelled' || needs.autopkg_test.result == 'cancelled'
       run: |
         echo "RESULT=error" >> $GITHUB_ENV
         echo "MSG=Package build cancelled" >> $GITHUB_ENV
 
     - name: Set failure
-      if: needs.sourcepackage.result == 'failure' || needs.binary_packages.result == 'failure' || needs.api_verification.result == 'failure'
+      if: needs.sourcepackage.result == 'failure' || needs.binary_packages.result == 'failure' || needs.api_verification.result == 'failure' || needs.autopkg_test.result == 'failure'
       run: |
         echo "RESULT=failure" >> $GITHUB_ENV
         echo "MSG=Package build failed" >> $GITHUB_ENV

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,53 @@
 # Keyman Version History
 
+## 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.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.297
+18.0.12
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/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
@@ -13,6 +13,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,

diff --git a/package-lock.json b/package-lock.json
diff --git a/windows/src/desktop/help/about/whatsnew.md b/windows/src/desktop/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 Windows:
+Here are some of the new features we have added to Keyman 18.0 for Windows:
 
 - Support for the new LDML Keyboard Standard.
 - Updates to the Keyman for Windows engine to align with enhancements made to Keyman Core, improving the efficiency of processing the input text with each keystroke.

diff --git a/windows/src/desktop/help/index.md b/windows/src/desktop/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman 17.0 Help
+title: Keyman 18.0 Help
 ---
 
 Need help using Keyman for Windows? You'll find everything you need here, including product documentation,