From 05d272eb19d118cfc17a64a0d6d1a062cc789430 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 15 Feb 2024 09:41:04 +0700 Subject: [PATCH 01/43] chore: move to 18.0 alpha --- VERSION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.md b/VERSION.md index 63ae42b603c..1bb332bc466 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -17.0.268 \ No newline at end of file +18.0.1 \ No newline at end of file From 7c8f109c33731c8780f0dcfc674cea17d5e6dfa6 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 15 Feb 2024 09:51:36 +0700 Subject: [PATCH 02/43] chore: update doc versions to 18.0 --- android/help/about/whatsnew.md | 12 +----------- android/help/index.md | 2 +- ios/help/about/whatsnew.md | 2 +- ios/help/index.md | 2 +- linux/help/about/whatsnew.md | 2 +- linux/help/index.md | 2 +- mac/help/about/whatsnew.md | 2 +- mac/help/index.md | 2 +- windows/src/desktop/help/about/whatsnew.md | 2 +- windows/src/desktop/help/index.md | 2 +- 10 files changed, 10 insertions(+), 20 deletions(-) diff --git a/android/help/about/whatsnew.md b/android/help/about/whatsnew.md index 9e9dc7e117f..bf16a6e263a 100644 --- a/android/help/about/whatsnew.md +++ b/android/help/about/whatsnew.md @@ -1,14 +1,4 @@ --- title: What's New --- -Here are some of the new features we have added to Keyman 17.0 for Android: - -* New gesture support (#5029) -* 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 index 6ba82a429bb..617b88abb5f 100644 --- 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 index ef14509db0a..ef778d368a9 100644 --- a/ios/help/about/whatsnew.md +++ b/ios/help/about/whatsnew.md @@ -2,5 +2,5 @@ title: What's New --- -Here are some of the new features we have added to Keyman for iPhone and iPad 17.0: +Here are some of the new features we have added to Keyman for iPhone and iPad 18.0: diff --git a/ios/help/index.md b/ios/help/index.md index 333dafb9f2d..e60600b32d1 100644 --- 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/help/about/whatsnew.md b/linux/help/about/whatsnew.md index 15fbf54339c..0f513f3a984 100644 --- a/linux/help/about/whatsnew.md +++ b/linux/help/about/whatsnew.md @@ -2,5 +2,5 @@ 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: diff --git a/linux/help/index.md b/linux/help/index.md index ca3b7b50e13..58d245063a2 100644 --- 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 index 4b4dc3d81fe..bb92c6582cb 100644 --- a/mac/help/about/whatsnew.md +++ b/mac/help/about/whatsnew.md @@ -2,5 +2,5 @@ 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: diff --git a/mac/help/index.md b/mac/help/index.md index 569db954aea..aa507a531eb 100644 --- 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/windows/src/desktop/help/about/whatsnew.md b/windows/src/desktop/help/about/whatsnew.md index 228dc2524ee..82087dd701c 100644 --- 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: ## Related Topics diff --git a/windows/src/desktop/help/index.md b/windows/src/desktop/help/index.md index f5d5ddf3780..7f5ddfd4636 100644 --- 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, From 51f4251721969d9127724d610ee8051f8b172da6 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 15 Feb 2024 10:21:15 +0700 Subject: [PATCH 03/43] chore: history --- HISTORY.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 441a4b90c49..166a6bdc684 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 18.0.1 alpha 2024-02-15 + +* chore: move to 18.0 alpha + ## 17.0.267 alpha 2024-02-14 * fix(linux): Use temp dir if we can't create cache dir (#10681) From 3a106f2876f3e6afbf7dd0d87c0b0c680ef78329 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Thu, 15 Feb 2024 01:55:46 -0500 Subject: [PATCH 04/43] auto: increment master version to 18.0.2 --- HISTORY.md | 1 + VERSION.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 166a6bdc684..585e5bd4417 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,7 @@ ## 18.0.1 alpha 2024-02-15 +* chore(common): move to 18.0 alpha (#10713) * chore: move to 18.0 alpha ## 17.0.267 alpha 2024-02-14 diff --git a/VERSION.md b/VERSION.md index 1bb332bc466..65f32da28fe 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.1 \ No newline at end of file +18.0.2 \ No newline at end of file From 9aebb2b41d21b021324d452cd861b714585392a5 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Mon, 19 Feb 2024 19:26:16 +0100 Subject: [PATCH 05/43] chore(linux): Add testbuild info to workflow title This change adds the `isTestBuild` flag to the workflow title to make it easier to find the release builds. --- .github/workflows/deb-packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 834ef4b892f..cef47662251 100644 --- 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:*'] From 36658bdab4d26d5ca96db1426976da7f2dc111df Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Tue, 20 Feb 2024 13:01:55 -0500 Subject: [PATCH 06/43] auto: increment master version to 18.0.3 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 585e5bd4417..ad2e04c8d58 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index 65f32da28fe..0d090d21b7f 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.2 \ No newline at end of file +18.0.3 \ No newline at end of file From 0dc1fee86015ca2788581915d41ac077bc6be2c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 21:48:09 +0000 Subject: [PATCH 07/43] chore(deps): bump ip from 2.0.0 to 2.0.1 Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1. - [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f6a9e8a6928..7ea71890287 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8053,9 +8053,9 @@ } }, "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "optional": true }, "node_modules/ipaddr.js": { From 7f92178b6a9093b406b09a40d3d4f5961c941661 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 21 Feb 2024 16:36:28 +0100 Subject: [PATCH 08/43] chore(linux): Update debian changelog (cherry picked from commit 1120e8a2a132006e444f12dd91755dafe63d1736) --- linux/debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linux/debian/changelog b/linux/debian/changelog index 25a7e0cf593..0f50fdc4c98 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,10 @@ +keyman (17.0.272-1) unstable; urgency=medium + + * New upstream release. + * Re-release to Debian + + -- Eberhard Beilharz Wed, 21 Feb 2024 16:36:14 +0100 + keyman (16.0.145-1) unstable; urgency=medium [Jeremy Bicha] From 087a89b5b7b146e7da2ad83e4f684275a0385d0b Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Wed, 21 Feb 2024 13:01:51 -0500 Subject: [PATCH 09/43] auto: increment master version to 18.0.4 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index ad2e04c8d58..243f35013c4 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index 0d090d21b7f..b305c08f2ef 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.3 \ No newline at end of file +18.0.4 \ No newline at end of file From e8e0c1d31f15bfe05313b64989fe9fd28c3f007b Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 23 Feb 2024 11:44:57 +0100 Subject: [PATCH 10/43] chore(linux): Add running autopkgtests on GHA --- .github/workflows/deb-packaging.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index cef47662251..40a3a97ee36 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -152,6 +152,32 @@ 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 + + - 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 + deb_signing: name: Sign source and binary packages needs: [sourcepackage, binary_packages] From 501377a5c312fbf271da6813b4e556ee9238e142 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 23 Feb 2024 15:16:09 +0100 Subject: [PATCH 11/43] fix(linux): Dynamically get package name Fixes API verification step in packaging gha. --- .github/workflows/deb-packaging.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index cef47662251..2a720edceef 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -280,7 +280,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" \ From 180f5cb84374162c2f0fa77ff6aeadf7f2f8d546 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Fri, 23 Feb 2024 13:02:07 -0500 Subject: [PATCH 12/43] auto: increment master version to 18.0.5 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 243f35013c4..8714d84e392 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index b305c08f2ef..fed6026241f 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.4 \ No newline at end of file +18.0.5 \ No newline at end of file From a46b9ee8e2d464b6ffc560d618e8514b11ab43a0 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 23 Feb 2024 15:45:28 +0100 Subject: [PATCH 13/43] chore(linux): Update debian changelog (cherry picked from commit 9408adab7035d241612f31cceac1dbad525f3088) --- linux/debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/linux/debian/changelog b/linux/debian/changelog index 0f50fdc4c98..ae731603dc8 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,11 @@ +keyman (17.0.274-1) unstable; urgency=medium + + * Fix autopkg tests + * New upstream release. + * Re-release to Debian + + -- Eberhard Beilharz Fri, 23 Feb 2024 15:45:13 +0100 + keyman (17.0.272-1) unstable; urgency=medium * New upstream release. From 3b37a604dcf88a3b51f9c73387883a584d7ed1ce Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Mon, 26 Feb 2024 16:27:36 +0100 Subject: [PATCH 14/43] fix(linux): Fix autopkgtest gha - installing missing dependencies - consider autopkgtest result in final status --- .github/workflows/deb-packaging.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index dd079d0d8ee..4d9949ca427 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -166,7 +166,7 @@ jobs: - name: Install dependencies run: | - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install autopkgtest qemu-system qemu-utils autodep8 + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install autopkgtest qemu-system qemu-utils autodep8 genisoimage python3-distro-info - name: Build test image run: | @@ -325,24 +325,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 From f51504ac5c4d5193f4c37333d565054ec76a4b56 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Mon, 26 Feb 2024 13:04:18 -0500 Subject: [PATCH 15/43] auto: increment master version to 18.0.6 --- HISTORY.md | 6 ++++++ VERSION.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 8714d84e392..dfed29ade77 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,11 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index fed6026241f..999ba7db2e4 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.5 \ No newline at end of file +18.0.6 \ No newline at end of file From 59d287a9df7530071ae7b9e3830a40b730acbbcf Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Mon, 26 Feb 2024 19:17:14 +0100 Subject: [PATCH 16/43] chore(linux): Temporarily disable autopkgtests gha --- .github/workflows/deb-packaging.yml | 39 ++++++++++++++++------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 4d9949ca427..2a5516cd814 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -158,25 +158,28 @@ jobs: 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 + # - 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: | - cd "${GITHUB_WORKSPACE}/artifacts" - autopkgtest -B *.deb keyman_*.dsc -- qemu autopkgtest-jammy-amd64.img + echo "Ignored for now - until working solution is in place" deb_signing: name: Sign source and binary packages From ef591f74d75eac93a21372a0de0019899bda65cb Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Tue, 27 Feb 2024 13:05:16 -0500 Subject: [PATCH 17/43] auto: increment master version to 18.0.7 --- HISTORY.md | 5 +++++ VERSION.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index dfed29ade77..d6a686b66d8 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,10 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index 999ba7db2e4..f64fde373c0 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.6 \ No newline at end of file +18.0.7 \ No newline at end of file From a2cf9e646fdc324f8a7935af88cecaba5925dcb4 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Thu, 29 Feb 2024 09:43:15 +0700 Subject: [PATCH 18/43] chore(common): revert tier to alpha --- TIER.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TIER.md b/TIER.md index 65b2df87f7d..4a58007052a 100644 --- a/TIER.md +++ b/TIER.md @@ -1 +1 @@ -beta +alpha From 83b73112d72d15f73d340f034767046d687c9698 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Thu, 29 Feb 2024 13:03:50 -0500 Subject: [PATCH 19/43] auto: increment master version to 18.0.8 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index e136044e844..27493fbe8a1 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index f64fde373c0..fee4da9f584 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.7 \ No newline at end of file +18.0.8 \ No newline at end of file From 92c3848846566c167f087158ab42bcd420ccf6e6 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Thu, 29 Feb 2024 19:17:22 +0100 Subject: [PATCH 20/43] chore(linux): Update debian changelog (cherry picked from commit 024553dd26ddcc2fe7a645d258169dd9ca4f510f) --- linux/debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/linux/debian/changelog b/linux/debian/changelog index ae731603dc8..7c4e3b2c973 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,11 @@ +keyman (17.0.279-1) unstable; urgency=medium + + * Add libicu-dev dependency to libkeymancore-dev (closes: #1064915) + * New upstream release. + * Re-release to Debian + + -- Eberhard Beilharz Thu, 29 Feb 2024 19:17:08 +0100 + keyman (17.0.274-1) unstable; urgency=medium * Fix autopkg tests From 4ccb2bb70d842066e4564a03857fbd7dd59bb2d9 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Fri, 1 Mar 2024 13:36:32 +0700 Subject: [PATCH 21/43] chore: revert tier and version --- TIER.md | 2 +- VERSION.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TIER.md b/TIER.md index 65b2df87f7d..4a58007052a 100644 --- a/TIER.md +++ b/TIER.md @@ -1 +1 @@ -beta +alpha diff --git a/VERSION.md b/VERSION.md index 3065797f00a..fee4da9f584 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -17.0.280 \ No newline at end of file +18.0.8 \ No newline at end of file From 30329fe82b4b7520371e549f882d0afb44c35802 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Mon, 4 Mar 2024 13:03:48 -0500 Subject: [PATCH 22/43] auto: increment master version to 18.0.9 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 27493fbe8a1..44c63aebb2c 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index fee4da9f584..ed0c79eb165 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.8 \ No newline at end of file +18.0.9 \ No newline at end of file From 9ea2ba4739774a5a39247bcd780484dba42958ad Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Tue, 5 Mar 2024 13:04:24 -0500 Subject: [PATCH 23/43] auto: increment master version to 18.0.10 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 451466b8bf1..f14f4b5e586 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index ed0c79eb165..ac9886ab33d 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.9 \ No newline at end of file +18.0.10 \ No newline at end of file From 87e383fde79e8b5d8b1f2d2f2e39526c19d96454 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 15:16:22 +0000 Subject: [PATCH 24/43] chore(deps-dev): bump follow-redirects from 1.15.4 to 1.15.6 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 17f27863d4c..135a9e8074a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7503,9 +7503,9 @@ "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "dev": true, "funding": [ { From 250d9ba1484fa622191c557e80b8c1f4f401be56 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Sat, 16 Mar 2024 14:04:13 -0400 Subject: [PATCH 25/43] auto: increment master version to 18.0.11 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 2f7554af849..48b09edc27f 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index ac9886ab33d..d8919ffaa34 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.10 \ No newline at end of file +18.0.11 \ No newline at end of file From c60e51f8dc877a1407b9911914467bfdfec5cf82 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Wed, 20 Mar 2024 14:04:04 -0400 Subject: [PATCH 26/43] auto: increment master version to 18.0.12 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 48b09edc27f..4ee94959840 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # 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) diff --git a/VERSION.md b/VERSION.md index d8919ffaa34..898e94c8aa3 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.11 \ No newline at end of file +18.0.12 \ No newline at end of file From a59ccfe8046ea2a606da9768a71dc8b1a24f8d7f Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 27 Mar 2024 17:14:55 +0100 Subject: [PATCH 27/43] chore(linux): Update debian changelog (cherry picked from commit 0bf30d3ef9dcbebb7f60edded3e137237e1c4d47) --- linux/debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/linux/debian/changelog b/linux/debian/changelog index 3ec5a56cfe7..e5e2a939b6c 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,8 +1,10 @@ -keyman (17.0.279-2) UNRELEASED; urgency=medium +keyman (17.0.295-1) unstable; urgency=medium * Remove ibus-keyman.post{inst,rm} (closes: #1034040) + * New upstream release. + * Re-release to Debian - -- Eberhard Beilharz Tue, 05 Mar 2024 10:41:54 +0100 + -- Eberhard Beilharz Wed, 27 Mar 2024 17:14:32 +0100 keyman (17.0.279-1) unstable; urgency=medium From 7f79017eb8e6fedd1a79dc145664c560958f1b34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 08:36:50 +0000 Subject: [PATCH 28/43] chore(deps): bump express from 4.17.3 to 4.19.2 Bumps [express](https://github.com/expressjs/express) from 4.17.3 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.3...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- developer/src/server/package.json | 2 +- package-lock.json | 267 +++++++++++++++++++++++------- 2 files changed, 206 insertions(+), 63 deletions(-) diff --git a/developer/src/server/package.json b/developer/src/server/package.json index f59cc5bbbca..77acddefd6b 100644 --- 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/package-lock.json b/package-lock.json index 99603adcdb4..3a19da0233d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2787,7 +2787,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", @@ -4965,22 +4965,26 @@ } }, "node_modules/body-parser": { - "version": "1.19.2", - "license": "MIT", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.8.1", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.9.7", - "raw-body": "2.4.3", - "type-is": "~1.6.18" + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" }, "engines": { - "node": ">= 0.8" + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" } }, "node_modules/body-parser/node_modules/debug": { @@ -4990,10 +4994,29 @@ "ms": "2.0.0" } }, + "node_modules/body-parser/node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", "license": "MIT" }, + "node_modules/body-parser/node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "devOptional": true, @@ -5115,7 +5138,8 @@ }, "node_modules/bytes": { "version": "3.1.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "engines": { "node": ">= 0.8" } @@ -5270,7 +5294,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -5583,8 +5606,9 @@ } }, "node_modules/content-type": { - "version": "1.0.4", - "license": "MIT", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "engines": { "node": ">= 0.6" } @@ -5596,6 +5620,7 @@ }, "node_modules/cookie": { "version": "0.4.2", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -5866,6 +5891,7 @@ "node_modules/depd": { "version": "1.1.2", "license": "MIT", + "optional": true, "engines": { "node": ">= 0.6" } @@ -5875,8 +5901,13 @@ "license": "ISC" }, "node_modules/destroy": { - "version": "1.0.4", - "license": "MIT" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } }, "node_modules/di": { "version": "0.0.1", @@ -7073,7 +7104,8 @@ }, "node_modules/etag": { "version": "1.8.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "engines": { "node": ">= 0.6" } @@ -7178,36 +7210,38 @@ } }, "node_modules/express": { - "version": "4.17.3", - "license": "MIT", + "version": "4.19.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", + "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.19.2", + "body-parser": "1.20.2", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.4.2", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", + "depd": "2.0.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "~1.1.2", + "finalhandler": "1.2.0", "fresh": "0.5.2", + "http-errors": "2.0.0", "merge-descriptors": "1.0.1", "methods": "~1.1.2", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", "proxy-addr": "~2.0.7", - "qs": "6.9.7", + "qs": "6.11.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.17.2", - "serve-static": "1.14.2", + "send": "0.18.0", + "serve-static": "1.15.0", "setprototypeof": "1.2.0", - "statuses": "~1.5.0", + "statuses": "2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" @@ -7216,6 +7250,14 @@ "node": ">= 0.10.0" } }, + "node_modules/express/node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "license": "MIT", @@ -7223,10 +7265,54 @@ "ms": "2.0.0" } }, + "node_modules/express/node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/express/node_modules/ms": { "version": "2.0.0", "license": "MIT" }, + "node_modules/express/node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/extend": { "version": "3.0.2", "dev": true, @@ -7353,6 +7439,7 @@ }, "node_modules/finalhandler": { "version": "1.1.2", + "dev": true, "license": "MIT", "dependencies": { "debug": "2.6.9", @@ -7369,6 +7456,7 @@ }, "node_modules/finalhandler/node_modules/debug": { "version": "2.6.9", + "dev": true, "license": "MIT", "dependencies": { "ms": "2.0.0" @@ -7376,6 +7464,7 @@ }, "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", + "dev": true, "license": "MIT" }, "node_modules/find-up": { @@ -7483,7 +7572,8 @@ }, "node_modules/fresh": { "version": "0.5.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "engines": { "node": ">= 0.6" } @@ -7548,7 +7638,6 @@ }, "node_modules/function-bind": { "version": "1.1.1", - "dev": true, "license": "MIT" }, "node_modules/function.prototype.name": { @@ -7663,7 +7752,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", - "dev": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -7917,7 +8005,6 @@ }, "node_modules/has": { "version": "1.0.3", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.1" @@ -7970,7 +8057,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -8055,17 +8141,34 @@ "license": "BSD-2-Clause" }, "node_modules/http-errors": { - "version": "1.8.1", - "license": "MIT", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dependencies": { - "depd": "~1.1.2", + "depd": "2.0.0", "inherits": "2.0.4", "setprototypeof": "1.2.0", - "statuses": ">= 1.5.0 < 2", + "statuses": "2.0.1", "toidentifier": "1.0.1" }, "engines": { - "node": ">= 0.6" + "node": ">= 0.8" + } + }, + "node_modules/http-errors/node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/http-errors/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "engines": { + "node": ">= 0.8" } }, "node_modules/http-proxy": { @@ -8130,7 +8233,8 @@ }, "node_modules/iconv-lite": { "version": "0.4.24", - "license": "MIT", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -10296,7 +10400,6 @@ "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -10351,6 +10454,7 @@ }, "node_modules/on-finished": { "version": "2.3.0", + "dev": true, "license": "MIT", "dependencies": { "ee-first": "1.1.1" @@ -10715,8 +10819,12 @@ } }, "node_modules/qs": { - "version": "6.9.7", - "license": "BSD-3-Clause", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dependencies": { + "side-channel": "^1.0.4" + }, "engines": { "node": ">=0.6" }, @@ -10776,11 +10884,12 @@ } }, "node_modules/raw-body": { - "version": "2.4.3", - "license": "MIT", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dependencies": { "bytes": "3.1.2", - "http-errors": "1.8.1", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", "unpipe": "1.0.0" }, @@ -11063,22 +11172,23 @@ } }, "node_modules/send": { - "version": "0.17.2", - "license": "MIT", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "dependencies": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", + "depd": "2.0.0", + "destroy": "1.2.0", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.8.1", + "http-errors": "2.0.0", "mime": "1.6.0", "ms": "2.1.3", - "on-finished": "~2.3.0", + "on-finished": "2.4.1", "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "statuses": "2.0.1" }, "engines": { "node": ">= 0.8.0" @@ -11086,18 +11196,29 @@ }, "node_modules/send/node_modules/debug": { "version": "2.6.9", - "license": "MIT", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dependencies": { "ms": "2.0.0" } }, "node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/send/node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } }, "node_modules/send/node_modules/mime": { "version": "1.6.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "bin": { "mime": "cli.js" }, @@ -11107,7 +11228,27 @@ }, "node_modules/send/node_modules/ms": { "version": "2.1.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/send/node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/send/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "engines": { + "node": ">= 0.8" + } }, "node_modules/serialize-javascript": { "version": "5.0.1", @@ -11118,13 +11259,14 @@ } }, "node_modules/serve-static": { - "version": "1.14.2", - "license": "MIT", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.17.2" + "send": "0.18.0" }, "engines": { "node": ">= 0.8.0" @@ -11193,7 +11335,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -11403,6 +11544,7 @@ }, "node_modules/statuses": { "version": "1.5.0", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -11711,7 +11853,8 @@ }, "node_modules/toidentifier": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "engines": { "node": ">=0.6" } From a3bb706e85756bafb83cce18fc3f010463c16414 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Thu, 28 Mar 2024 14:20:27 -0400 Subject: [PATCH 29/43] auto: increment master version to 18.0.13 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 52527512a38..91ebedb0bb0 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index 898e94c8aa3..0030c81d4f1 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.12 \ No newline at end of file +18.0.13 \ No newline at end of file From e8b3f712401fa25e388a4dbb2903d1a911ed4a6b Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Fri, 29 Mar 2024 14:08:13 -0400 Subject: [PATCH 30/43] auto: increment master version to 18.0.14 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 91ebedb0bb0..eb290966fba 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index 0030c81d4f1..c3da0e28bbd 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.13 \ No newline at end of file +18.0.14 \ No newline at end of file From 043f2c65f5f43d570b1d3e818f0aae8c248ca251 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Tue, 2 Apr 2024 17:29:00 +0200 Subject: [PATCH 31/43] chore(linux): Build packages for next Ubuntu version separately This change splits the package builds into building packages for the released Ubuntu versions and for the next version. A failure to build packages for the next version will no longer fail the packaging GHA. Closes #11143. --- .../actions/build-binary-packages/action.yml | 58 ++++++++++++++++ .github/workflows/deb-packaging.yml | 67 +++++++++---------- 2 files changed, 90 insertions(+), 35 deletions(-) create mode 100644 .github/actions/build-binary-packages/action.yml diff --git a/.github/actions/build-binary-packages/action.yml b/.github/actions/build-binary-packages/action.yml new file mode 100644 index 00000000000..79863764270 --- /dev/null +++ b/.github/actions/build-binary-packages/action.yml @@ -0,0 +1,58 @@ +name: build-binary-packages +description: | + Build binary packages +inputs: + dist: + description: 'dist to build binary packages for' + required: true + arch: + description: 'the architecture' + required: false + default: 'amd64' + version: + description: 'The Keyman version' + required: true + prerelease_tag: + description: 'The prerelease tag' + required: true + deb_fullname: + description: 'The full name used for the packages' + required: true + deb_email: + description: 'The email address used for the packages' + required: true +runs: + using: 'composite' + steps: + - name: Download Artifacts + uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1 + with: + name: keyman-srcpkg + path: artifacts/keyman-srcpkg + + - name: Build + uses: sillsdev/gha-ubuntu-packaging@1f4b7e7eacb8c82a4d874ee2c371b9bfef7e16ea # v1.0 + with: + dist: "${{ inputs.dist }}" + platform: "${{ inputs.arch }}" + source_dir: "artifacts/keyman-srcpkg" + sourcepackage: "keyman_${{ inputs.version }}-1.dsc" + deb_fullname: ${{inputs.deb_fullname}} + deb_email: ${{inputs.deb_email}} + prerelease_tag: ${{ inputs.prerelease_tag }} + + - name: Output resulting .deb files + shell: bash + run: | + echo '```' >> $GITHUB_STEP_SUMMARY + echo "$(find artifacts/ -name \*.deb)" >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY + + - name: Store binary packages + uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + with: + name: keyman-binarypkgs-${{ inputs.dist }}_${{ inputs.arch }} + path: | + artifacts/* + !artifacts/keyman-srcpkg/ + if: always() diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 2a5516cd814..3ecfd6d2a3e 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -109,52 +109,48 @@ jobs: debian/***/* if: always() - binary_packages: - name: Build binary packages + binary_packages_released: + name: Build binary packages for released versions needs: sourcepackage strategy: fail-fast: true matrix: - dist: [focal, jammy, mantic, noble] - arch: [amd64] + dist: [focal, jammy, mantic] runs-on: ubuntu-latest steps: - - name: Download Artifacts - uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1 - with: - name: keyman-srcpkg - path: artifacts/keyman-srcpkg - - name: Build - uses: sillsdev/gha-ubuntu-packaging@1f4b7e7eacb8c82a4d874ee2c371b9bfef7e16ea # v1.0 + uses: ./.github/actions/build-binary-package with: - dist: "${{ matrix.dist }}" - platform: "${{ matrix.arch }}" - source_dir: "artifacts/keyman-srcpkg" - sourcepackage: "keyman_${{ needs.sourcepackage.outputs.VERSION }}-1.dsc" + dist: ${{ matrix.dist }} + version: ${{ needs.sourcepackage.outputs.VERSION }} + prerelease_tag: ${{ needs.sourcepackage.outputs.PRERELEASE_TAG }} deb_fullname: ${{env.DEBFULLNAME}} deb_email: ${{env.DEBEMAIL}} - prerelease_tag: ${{ needs.sourcepackage.outputs.PRERELEASE_TAG }} - - name: Output resulting .deb files - run: | - echo '```' >> $GITHUB_STEP_SUMMARY - echo "$(find artifacts/ -name \*.deb)" >> $GITHUB_STEP_SUMMARY - echo '```' >> $GITHUB_STEP_SUMMARY + binary_packages_unreleased: + name: Build binary packages for next Ubuntu version + needs: sourcepackage + strategy: + fail-fast: true + matrix: + dist: [noble] - - name: Store binary packages - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + runs-on: ubuntu-latest + steps: + - name: Build + continue-on-error: true + uses: ./.github/actions/build-binary-package with: - name: keyman-binarypkgs-${{ matrix.dist }}_${{ matrix.arch }} - path: | - artifacts/* - !artifacts/keyman-srcpkg/ - if: always() + dist: ${{ matrix.dist }} + version: ${{ needs.sourcepackage.outputs.VERSION }} + prerelease_tag: ${{ needs.sourcepackage.outputs.PRERELEASE_TAG }} + deb_fullname: ${{env.DEBFULLNAME}} + deb_email: ${{env.DEBEMAIL}} autopkg_test: name: Run autopkgtests - needs: [binary_packages] + needs: [binary_packages_released] runs-on: ubuntu-latest steps: @@ -183,7 +179,7 @@ jobs: deb_signing: name: Sign source and binary packages - needs: [sourcepackage, binary_packages] + needs: [sourcepackage, binary_packages_released, binary_packages_unreleased] runs-on: ubuntu-latest environment: "deploy (linux)" if: github.event.client_payload.isTestBuild == 'false' @@ -285,7 +281,7 @@ jobs: api_verification: name: Verify API for libkeymancore.so - needs: [sourcepackage, binary_packages] + needs: [sourcepackage, binary_packages_released] runs-on: ubuntu-latest steps: @@ -326,26 +322,27 @@ jobs: path: linux/debian/tmp/DEBIAN/symbols if: always() + # We intentionally ignore the results of binary_packages_unreleased set_status: name: Set result status on PR builds - needs: [sourcepackage, binary_packages, api_verification, autopkg_test] + needs: [sourcepackage, binary_packages_released, 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' && needs.autopkg_test.result == 'success' + if: needs.sourcepackage.result == 'success' && needs.binary_packages_released.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' || needs.autopkg_test.result == 'cancelled' + if: needs.sourcepackage.result == 'cancelled' || needs.binary_packages_released.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' || needs.autopkg_test.result == 'failure' + if: needs.sourcepackage.result == 'failure' || needs.binary_packages_released.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 From 48adda6d2adfc212d1cdd0ae199c974e60884f03 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Tue, 2 Apr 2024 14:04:24 -0400 Subject: [PATCH 32/43] auto: increment master version to 18.0.15 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index eb290966fba..504e61d00ad 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index c3da0e28bbd..9e1e97e19e0 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.14 \ No newline at end of file +18.0.15 \ No newline at end of file From 4ac96654eddf52f8bec46bf399c07173cae5b2dd Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 3 Apr 2024 09:06:07 +0200 Subject: [PATCH 33/43] chore(linux): Fix typo --- .github/workflows/deb-packaging.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 3ecfd6d2a3e..4c2eff56dab 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -120,7 +120,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Build - uses: ./.github/actions/build-binary-package + uses: ./.github/actions/build-binary-packages with: dist: ${{ matrix.dist }} version: ${{ needs.sourcepackage.outputs.VERSION }} @@ -140,7 +140,7 @@ jobs: steps: - name: Build continue-on-error: true - uses: ./.github/actions/build-binary-package + uses: ./.github/actions/build-binary-packages with: dist: ${{ matrix.dist }} version: ${{ needs.sourcepackage.outputs.VERSION }} From 239f14597b7c8270ef52d86df5e5ff47eed8bfd9 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 3 Apr 2024 11:08:17 +0200 Subject: [PATCH 34/43] chore(linux): Checkout source before building binary packages Since we use an action that is defined in our source tree we have to checkout the source before we can build the binary packages. --- .github/workflows/deb-packaging.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 4c2eff56dab..5b21a91c338 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -119,6 +119,12 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0 + with: + ref: '${{ github.event.client_payload.buildSha }}' + sparse-checkout: '.github/actions/' + - name: Build uses: ./.github/actions/build-binary-packages with: @@ -138,6 +144,12 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0 + with: + ref: '${{ github.event.client_payload.buildSha }}' + sparse-checkout: '.github/actions/' + - name: Build continue-on-error: true uses: ./.github/actions/build-binary-packages From 104680b2bdf1dfda84d792215deaa51d2012f167 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 3 Apr 2024 11:14:14 +0200 Subject: [PATCH 35/43] chore(linux): Update checkout action to v4.1.1 --- .github/workflows/deb-packaging.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 5b21a91c338..2367bfb2d14 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -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 }}' @@ -120,7 +120,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 with: ref: '${{ github.event.client_payload.buildSha }}' sparse-checkout: '.github/actions/' @@ -145,7 +145,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 with: ref: '${{ github.event.client_payload.buildSha }}' sparse-checkout: '.github/actions/' From 2fe4da7cca369558a5696f82bf618b42d4cd6f8d Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 3 Apr 2024 11:20:27 +0200 Subject: [PATCH 36/43] chore(linux): Ignore failed package builds for next Ubuntu differently Previously failed package builds for the next Ubuntu release showed up with a green check mark. This change allows them to fail, but ignores them for the following steps. --- .github/workflows/deb-packaging.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 2367bfb2d14..27c3f11c8d8 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -151,7 +151,6 @@ jobs: sparse-checkout: '.github/actions/' - name: Build - continue-on-error: true uses: ./.github/actions/build-binary-packages with: dist: ${{ matrix.dist }} @@ -194,7 +193,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: ${{ github.event.client_payload.isTestBuild == 'false' && needs.sourcepackage.result == 'success' && needs.binary_packages_released.result == 'success' }} steps: - name: Sign packages @@ -212,7 +211,7 @@ jobs: needs: [sourcepackage, deb_signing] runs-on: self-hosted environment: "deploy (linux)" - if: github.event.client_payload.isTestBuild == 'false' + if: ${{ github.event.client_payload.isTestBuild == 'false' && needs.sourcepackage.result == 'success' && needs.deb_signing.result == 'success' }} steps: - name: Install dput @@ -295,6 +294,7 @@ jobs: name: Verify API for libkeymancore.so needs: [sourcepackage, binary_packages_released] runs-on: ubuntu-latest + if: ${{ needs.sourcepackage.result == 'success' && needs.binary_packages_released.result == 'success' }} steps: - name: Checkout From 774ba9be7ced34c30f69454b598faeb9daaf5772 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 3 Apr 2024 16:09:18 +0200 Subject: [PATCH 37/43] chore(linux): Revert "Ignore failed package builds for next Ubuntu differently" This reverts commit 2fe4da7cca369558a5696f82bf618b42d4cd6f8d. In my tests in a test repo `continue-on-error` worked as desired but also seeds the total result as succeeded if the other jobs succeed. It's possible that we got the behavior we saw because of syntax errors in our file, so this change tries with the original approach again. --- .github/workflows/deb-packaging.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 27c3f11c8d8..2367bfb2d14 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -151,6 +151,7 @@ jobs: sparse-checkout: '.github/actions/' - name: Build + continue-on-error: true uses: ./.github/actions/build-binary-packages with: dist: ${{ matrix.dist }} @@ -193,7 +194,7 @@ jobs: needs: [sourcepackage, binary_packages_released, binary_packages_unreleased] runs-on: ubuntu-latest environment: "deploy (linux)" - if: ${{ github.event.client_payload.isTestBuild == 'false' && needs.sourcepackage.result == 'success' && needs.binary_packages_released.result == 'success' }} + if: github.event.client_payload.isTestBuild == 'false' steps: - name: Sign packages @@ -211,7 +212,7 @@ jobs: needs: [sourcepackage, deb_signing] runs-on: self-hosted environment: "deploy (linux)" - if: ${{ github.event.client_payload.isTestBuild == 'false' && needs.sourcepackage.result == 'success' && needs.deb_signing.result == 'success' }} + if: github.event.client_payload.isTestBuild == 'false' steps: - name: Install dput @@ -294,7 +295,6 @@ jobs: name: Verify API for libkeymancore.so needs: [sourcepackage, binary_packages_released] runs-on: ubuntu-latest - if: ${{ needs.sourcepackage.result == 'success' && needs.binary_packages_released.result == 'success' }} steps: - name: Checkout From a9530fad2c09ea6a56a9ffafa2de5d0d3eed15d3 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Wed, 3 Apr 2024 14:04:51 -0400 Subject: [PATCH 38/43] auto: increment master version to 18.0.16 --- HISTORY.md | 6 ++++++ VERSION.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 504e61d00ad..5db986057f9 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,11 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index 9e1e97e19e0..64cbf7d404c 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.15 \ No newline at end of file +18.0.16 \ No newline at end of file From 0d7d240584f53a9e9ea458b2f804265b3a522f5a Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Thu, 4 Apr 2024 09:56:47 +0200 Subject: [PATCH 39/43] chore(linux): Sign packages even if build for next Ubuntu fails We want to run the `deb_signing` job after building binary packages for both released and unreleased Ubuntu versions finished, so we have to specify those in the `needs` field. But that on its own causes the signing job to be skipped if the binary package build for the next Ubuntu version fails. This change adds conditions so that the `deb_signing` job always runs if source package build and the binary package build for the released Ubuntu versions succeeds. --- .github/workflows/deb-packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 2367bfb2d14..48a251775e6 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -194,7 +194,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 From 2d283d4d1376730ecca600ee882a87541a86928d Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Thu, 4 Apr 2024 16:30:50 +0200 Subject: [PATCH 40/43] chore(linux): Show failed job for next Ubuntu version as failed This change shows failed package builds for the next Ubuntu version as failed. With the last change it still showed as green in the overview, despite my experiments. Turns out it depends where you put the `continue-on-error: true` statement: if it's in the `steps` section it'll show up green, if you put it in the job's metadata it'll work as expected and show up as failed. --- .github/workflows/deb-packaging.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index 48a251775e6..8752fe316db 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -112,12 +112,12 @@ 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 @@ -137,12 +137,13 @@ jobs: 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] - runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 @@ -151,7 +152,6 @@ jobs: sparse-checkout: '.github/actions/' - name: Build - continue-on-error: true uses: ./.github/actions/build-binary-packages with: dist: ${{ matrix.dist }} From d1573444dcc1205b5c604db1ebfc99a16533aa31 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Thu, 4 Apr 2024 16:50:14 +0200 Subject: [PATCH 41/43] chore(linux): Update gha-ubuntu-packaging action This removes warnings about deprecated Node.js 16. --- .github/actions/build-binary-packages/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-binary-packages/action.yml b/.github/actions/build-binary-packages/action.yml index 79863764270..27f02461214 100644 --- 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 }}" From 83fd08eec59f68bf30bf5d6d309fe71a83bff26c Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Thu, 4 Apr 2024 14:04:06 -0400 Subject: [PATCH 42/43] auto: increment master version to 18.0.17 --- HISTORY.md | 5 +++++ VERSION.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 5db986057f9..a2572c57645 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,10 @@ # Keyman Version History +## 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) diff --git a/VERSION.md b/VERSION.md index 64cbf7d404c..fae12adf375 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.16 \ No newline at end of file +18.0.17 \ No newline at end of file From 72bbc86d95c7a4bbfe3be06afe1651e4c513c0d7 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Fri, 5 Apr 2024 14:09:21 -0400 Subject: [PATCH 43/43] auto: increment master version to 18.0.18 --- HISTORY.md | 4 ++++ VERSION.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index a2572c57645..9a9785984bb 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # 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) diff --git a/VERSION.md b/VERSION.md index fae12adf375..32a2cdd9c7d 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.17 \ No newline at end of file +18.0.18 \ No newline at end of file