From 1b8ae8319fc5bad05637f4bc4957f6d957427808 Mon Sep 17 00:00:00 2001 From: Explorer09 Date: Thu, 13 Mar 2025 03:20:44 +0800 Subject: [PATCH 1/2] CI: Build "unsupported" htop with ubuntu-latest Use the "ubuntu-latest" image to build the "unsupported" version of htop. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 657fc12d9..115013982 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,7 @@ jobs: build-unsupported-latest-gcc: # build as if we were on an unsupported platform - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Install Dependencies From 7b9fd4b530ca5edb34f9bf68501a4b3a6c1f423e Mon Sep 17 00:00:00 2001 From: Explorer09 Date: Thu, 13 Mar 2025 15:57:36 +0800 Subject: [PATCH 2/2] CI: Use LLVM repo of correct Ubuntu versions The Clang build jobs in htop's CI now grabs the Ubuntu codename automatically from the /etc/os-release file of the Ubuntu image. This frees us the need to update the codenames when the "ubuntu-latest" image gets updated upstream (by GitHub). At the time of the writing, the "ubuntu-latest" image contains "ubuntu-24.04" (noble). Signed-off-by: Kang-Che Sung --- .github/workflows/ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 115013982..6178fbbb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,8 +36,9 @@ jobs: - uses: actions/checkout@v4 - name: install clang repo run: | + ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release` wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add - - sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' -y + sudo add-apt-repository "deb http://apt.llvm.org/${ubuntu_codename}/ llvm-toolchain-${ubuntu_codename}-18 main" -y sudo apt-get update -q - name: Install Dependencies run: sudo apt-get install --no-install-recommends clang-18 libncursesw5-dev @@ -77,8 +78,9 @@ jobs: - uses: actions/checkout@v4 - name: install clang repo run: | + ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release` wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add - - sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' -y + sudo add-apt-repository "deb http://apt.llvm.org/${ubuntu_codename}/ llvm-toolchain-${ubuntu_codename}-18 main" -y sudo apt-get update -q - name: Install Dependencies run: sudo apt-get install --no-install-recommends clang-18 libncursesw5-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev libsensors-dev libcap-dev @@ -146,8 +148,9 @@ jobs: - uses: actions/checkout@v4 - name: install clang repo run: | + ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release` wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add - - sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' -y + sudo add-apt-repository "deb http://apt.llvm.org/${ubuntu_codename}/ llvm-toolchain-${ubuntu_codename}-18 main" -y sudo apt-get update -q - name: Install Dependencies run: sudo apt-get install --no-install-recommends clang-18 clang-tools-18 libncursesw5-dev libnl-3-dev libnl-genl-3-dev libsensors-dev libcap-dev @@ -172,8 +175,9 @@ jobs: - uses: actions/checkout@v4 - name: install clang repo run: | + ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release` wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add - - sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' -y + sudo add-apt-repository "deb http://apt.llvm.org/${ubuntu_codename}/ llvm-toolchain-${ubuntu_codename}-18 main" -y sudo apt-get update -q - name: Install LLVM Toolchain run: sudo apt-get install --no-install-recommends clang-18 libclang-rt-18-dev llvm-18