Skip to content

Commit 60dd0f1

Browse files
authored
Merge pull request #1635 from Explorer09/ci-ubuntu-noble
CI: Update LLVM repo and use ubuntu-latest for building "unsupported" htop
2 parents ab5cc6a + 7b9fd4b commit 60dd0f1

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ jobs:
3636
- uses: actions/checkout@v4
3737
- name: install clang repo
3838
run: |
39+
ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release`
3940
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
40-
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' -y
41+
sudo add-apt-repository "deb http://apt.llvm.org/${ubuntu_codename}/ llvm-toolchain-${ubuntu_codename}-18 main" -y
4142
sudo apt-get update -q
4243
- name: Install Dependencies
4344
run: sudo apt-get install --no-install-recommends clang-18 libncursesw5-dev
@@ -77,8 +78,9 @@ jobs:
7778
- uses: actions/checkout@v4
7879
- name: install clang repo
7980
run: |
81+
ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release`
8082
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
81-
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' -y
83+
sudo add-apt-repository "deb http://apt.llvm.org/${ubuntu_codename}/ llvm-toolchain-${ubuntu_codename}-18 main" -y
8284
sudo apt-get update -q
8385
- name: Install Dependencies
8486
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
@@ -126,7 +128,7 @@ jobs:
126128

127129
build-unsupported-latest-gcc:
128130
# build as if we were on an unsupported platform
129-
runs-on: ubuntu-22.04
131+
runs-on: ubuntu-latest
130132
steps:
131133
- uses: actions/checkout@v4
132134
- name: Install Dependencies
@@ -146,8 +148,9 @@ jobs:
146148
- uses: actions/checkout@v4
147149
- name: install clang repo
148150
run: |
151+
ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release`
149152
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
150-
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' -y
153+
sudo add-apt-repository "deb http://apt.llvm.org/${ubuntu_codename}/ llvm-toolchain-${ubuntu_codename}-18 main" -y
151154
sudo apt-get update -q
152155
- name: Install Dependencies
153156
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:
172175
- uses: actions/checkout@v4
173176
- name: install clang repo
174177
run: |
178+
ubuntu_codename=`LC_ALL=C sed 's/^ *UBUNTU_CODENAME *= *\([a-z]*\).*$/\1/p; d' /etc/os-release`
175179
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
176-
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' -y
180+
sudo add-apt-repository "deb http://apt.llvm.org/${ubuntu_codename}/ llvm-toolchain-${ubuntu_codename}-18 main" -y
177181
sudo apt-get update -q
178182
- name: Install LLVM Toolchain
179183
run: sudo apt-get install --no-install-recommends clang-18 libclang-rt-18-dev llvm-18

0 commit comments

Comments
 (0)