From 32072d0f7d5a42cd718d97c61446f14142c32305 Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Wed, 5 Mar 2025 13:49:35 -0800 Subject: [PATCH 01/11] Update fw_icu4c_ci.yml --- .github/workflows/fw_icu4c_ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index ecbf5fba0dbe..c4dce36fab02 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -164,7 +164,7 @@ jobs: --dists "xenial focal bionic" \ --arches "amd64" \ --main-package-name "icu-fw" \ - --supported-distros "xenial focal bionic" \ + --supported-distros "noble xenial focal bionic" \ --package-version ${version} \ --preserve-changelog \ --build-in-place @@ -174,7 +174,7 @@ jobs: --dists "xenial focal bionic" \ --arches "amd64" \ --main-package-name "icu-fw" \ - --supported-distros "xenial focal bionic" \ + --supported-distros "noble xenial focal bionic" \ --build-in-place \ --no-upload' From 5fef84be3a0ca919fd2296516a0ce536d72f36f9 Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Wed, 5 Mar 2025 15:07:36 -0800 Subject: [PATCH 02/11] Update GitHub Actions to latest versions --- .github/workflows/fw_icu4c_ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index c4dce36fab02..30ba5a5e477c 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -23,7 +23,7 @@ jobs: version: ${{ steps.calc-version.outputs.result }} steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 @@ -47,13 +47,13 @@ jobs: echo "Version ${{ needs.set-version-number.outputs.version }}" - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe (Windows OS) - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - name: Build ICU 32 bit working-directory: icu4c @@ -89,7 +89,7 @@ jobs: run: msbuild nugetpackage/build/icu4c.proj /t:BuildPackage /p:PkgVersion=${{ needs.set-version-number.outputs.version }} - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: packages path: ./**/*.nupkg @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.2.2 with: fetch-depth: 0 @@ -130,7 +130,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4.2.2 - name: Checkout ci-build-tools run: | @@ -144,7 +144,7 @@ jobs: # TODO more will need done to do this successfully since some files are root readable only - name: Cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: /var/lib/schroot/chroots key: icu-debian-package-${{ github.ref_name }} @@ -179,7 +179,7 @@ jobs: --no-upload' - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: linux-packages path: | From a23f1b66b6766134da701fc9755683ec273dfcec Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Wed, 5 Mar 2025 17:45:47 -0800 Subject: [PATCH 03/11] Add noble in a couple more places --- .github/workflows/fw_icu4c_ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index 30ba5a5e477c..13b6c262ae5d 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -161,7 +161,7 @@ jobs: cd "${WORKSPACE}/" version="${{needs.set-version-number.outputs.version}}${{ env.package_suffix }}" ${CI_SCRIPT_DIR}/bash/make-source \ - --dists "xenial focal bionic" \ + --dists "noble xenial focal bionic" \ --arches "amd64" \ --main-package-name "icu-fw" \ --supported-distros "noble xenial focal bionic" \ @@ -171,7 +171,7 @@ jobs: mv --verbose ../icu-fw* . sudo sbuild-adduser runner sg sbuild '${CI_SCRIPT_DIR}/bash/build-package \ - --dists "xenial focal bionic" \ + --dists "noble xenial focal bionic" \ --arches "amd64" \ --main-package-name "icu-fw" \ --supported-distros "noble xenial focal bionic" \ From c1fc052c81b836ffe33206978290d2817c87ca68 Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Thu, 6 Mar 2025 12:15:34 -0800 Subject: [PATCH 04/11] Update .github/workflows/fw_icu4c_ci.yml Co-authored-by: Eberhard Beilharz --- .github/workflows/fw_icu4c_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index 13b6c262ae5d..61f601a37dd9 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -174,7 +174,7 @@ jobs: --dists "noble xenial focal bionic" \ --arches "amd64" \ --main-package-name "icu-fw" \ - --supported-distros "noble xenial focal bionic" \ + --supported-distros "noble jammy" \ --build-in-place \ --no-upload' From 2e6d82b56737bc4689ba96aeb6d6fad44a66f7ec Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Thu, 6 Mar 2025 12:15:43 -0800 Subject: [PATCH 05/11] Update .github/workflows/fw_icu4c_ci.yml Co-authored-by: Eberhard Beilharz --- .github/workflows/fw_icu4c_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index 61f601a37dd9..8a07c770c0d5 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -161,7 +161,7 @@ jobs: cd "${WORKSPACE}/" version="${{needs.set-version-number.outputs.version}}${{ env.package_suffix }}" ${CI_SCRIPT_DIR}/bash/make-source \ - --dists "noble xenial focal bionic" \ + --dists "noble jammy" \ --arches "amd64" \ --main-package-name "icu-fw" \ --supported-distros "noble xenial focal bionic" \ From f90ca5392509e167134f2810fa71216e0bf71a1b Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Thu, 6 Mar 2025 12:15:51 -0800 Subject: [PATCH 06/11] Update .github/workflows/fw_icu4c_ci.yml Co-authored-by: Eberhard Beilharz --- .github/workflows/fw_icu4c_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index 8a07c770c0d5..e592fba154f3 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -164,7 +164,7 @@ jobs: --dists "noble jammy" \ --arches "amd64" \ --main-package-name "icu-fw" \ - --supported-distros "noble xenial focal bionic" \ + --supported-distros "noble jammy" \ --package-version ${version} \ --preserve-changelog \ --build-in-place From cfb1029eb704f4e738fa69e1328082cabceaaef8 Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Thu, 6 Mar 2025 12:17:41 -0800 Subject: [PATCH 07/11] Update .github/workflows/fw_icu4c_ci.yml Co-authored-by: Eberhard Beilharz --- .github/workflows/fw_icu4c_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index e592fba154f3..4b74dc1bbcb5 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -171,7 +171,7 @@ jobs: mv --verbose ../icu-fw* . sudo sbuild-adduser runner sg sbuild '${CI_SCRIPT_DIR}/bash/build-package \ - --dists "noble xenial focal bionic" \ + --dists "noble jammy" \ --arches "amd64" \ --main-package-name "icu-fw" \ --supported-distros "noble jammy" \ From cff099c3622e980d23502f7109b93583092dad6d Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 7 Mar 2025 12:24:04 +0100 Subject: [PATCH 08/11] chore: remove group password It seems that with Ubuntu 24.04 the sbuild group has a password set. This change removes the password so that we can use the `sg sbuild` command without providing a password. --- .github/workflows/fw_icu4c_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index 4b74dc1bbcb5..1e517cd32286 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -170,6 +170,7 @@ jobs: --build-in-place mv --verbose ../icu-fw* . sudo sbuild-adduser runner + sudo gpasswd --remove-password sbuild sg sbuild '${CI_SCRIPT_DIR}/bash/build-package \ --dists "noble jammy" \ --arches "amd64" \ From 4293209d8de6e5a46029a82826190268966813c5 Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Fri, 7 Mar 2025 09:36:43 -0800 Subject: [PATCH 09/11] Add universe in repository to debian packaging step --- .github/workflows/fw_icu4c_ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index 1e517cd32286..7a67356145f9 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -132,6 +132,9 @@ jobs: - name: Checkout uses: actions/checkout@v4.2.2 + - name: Install prerequisites + run: sudo add-apt-repository --component universe + - name: Checkout ci-build-tools run: | set -xueo pipefail @@ -154,6 +157,7 @@ jobs: WORKAREA: /home/runner/work/${{github.event.repository.name}} run: | set -xueo pipefail + sudo add-apt-repository --component universe sudo apt-get install -y devscripts dh-make sendmail sbuild mkdir --verbose --parents ~/.gnupg export WORKSPACE="${WORKAREA}/icu/icu4c" From 0801a38b4eece0ce0a181f8fd9dbdbed180679e5 Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Fri, 7 Mar 2025 10:08:36 -0800 Subject: [PATCH 10/11] Update after adding the new repositories --- .github/workflows/fw_icu4c_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index 7a67356145f9..9fa44ed16114 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -158,6 +158,7 @@ jobs: run: | set -xueo pipefail sudo add-apt-repository --component universe + sudo apt update sudo apt-get install -y devscripts dh-make sendmail sbuild mkdir --verbose --parents ~/.gnupg export WORKSPACE="${WORKAREA}/icu/icu4c" From 4414f582a7b88d5f0e9a216e61bb4c6a60bb6405 Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Fri, 14 Mar 2025 09:32:35 -0700 Subject: [PATCH 11/11] Update after adding in the prerequisites step --- .github/workflows/fw_icu4c_ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fw_icu4c_ci.yml b/.github/workflows/fw_icu4c_ci.yml index 9fa44ed16114..7dfd185d693b 100644 --- a/.github/workflows/fw_icu4c_ci.yml +++ b/.github/workflows/fw_icu4c_ci.yml @@ -133,7 +133,9 @@ jobs: uses: actions/checkout@v4.2.2 - name: Install prerequisites - run: sudo add-apt-repository --component universe + run: | + sudo add-apt-repository --component universe + sudo apt-get update - name: Checkout ci-build-tools run: | @@ -159,7 +161,7 @@ jobs: set -xueo pipefail sudo add-apt-repository --component universe sudo apt update - sudo apt-get install -y devscripts dh-make sendmail sbuild + sudo apt-get install -y ubuntu-dev-tools devscripts dh-make sendmail sbuild mkdir --verbose --parents ~/.gnupg export WORKSPACE="${WORKAREA}/icu/icu4c" export CI_SCRIPT_DIR="${WORKAREA}/ci-builder-scripts"