CI WSL: upgrade to Ubuntu 24.04 and Qt6

This commit is contained in:
Philippe Teuwen
2026-02-27 15:54:29 +01:00
parent 866fe62666
commit 65be119a42
2 changed files with 10 additions and 18 deletions
+6 -14
View File
@@ -98,9 +98,9 @@ jobs:
steps:
- name: WSL setup
uses: Vampire/setup-wsl@v3
uses: Vampire/setup-wsl@v5
with:
distribution: Ubuntu-22.04
distribution: Ubuntu-24.04
update: "true"
additional-packages: git
ca-certificates
@@ -115,22 +115,14 @@ jobs:
qtbase5-dev
cmake
libpython3-dev
python3
python3-pip
python3-dev
libpython3-all-dev
libssl-dev
libgd-dev
- name: Install Python dependencies
- name: Install uv
run: |
python3 -m pip install --upgrade pip
python3 -m pip install setuptools
python3 -m pip install ansicolors sslcrypto
- name: WSL QT fix
run: sudo strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
curl -LsSf https://astral.sh/uv/install.sh | sh
install -m 0755 /root/.local/bin/uv /usr/local/bin/
install -m 0755 /root/.local/bin/uvx /usr/local/bin/
- name: Set git to use LF
shell: bash
run: |
@@ -131,7 +131,7 @@ WSL 1 requires to run on Windows 10 version 1709 or above. Previous windows vers
### More about WSL 1
^[Top](#top)
Install WSL 1 with e.g. the standard Ubuntu. You can follow the guide on [Microsoft Docs](https://docs.microsoft.com/en-us/windows/wsl/install-win10) but be careful to follow WSL 1 specific instructions! When they recommend you to restart, you must restart.
Install WSL 1 with e.g. the standard Ubuntu 24.04 or later. You can follow the guide on [Microsoft Docs](https://docs.microsoft.com/en-us/windows/wsl/install-win10) but be careful to follow WSL 1 specific instructions! When they recommend you to restart, you must restart.
For WSL 1 configuration, see [Manage and configure Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/wsl-config).
@@ -169,12 +169,12 @@ Install dependencies:
```sh
sudo apt-get install --no-install-recommends git ca-certificates build-essential pkg-config \
libreadline-dev gcc-arm-none-eabi libnewlib-dev \
libbz2-dev liblz4-dev libpython3-dev qtbase5-dev libssl-dev libgd-dev
libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev \
libbz2-dev liblz4-dev libpython3-dev libssl-dev libgd-dev
```
> [!NOTE]
> * If you don't need the graphical components of the
> Proxmark3 client, you can skip the installation of `qtbase5-dev`.
> Proxmark3 client, you can skip the installation of `qtbase6-dev`.
> * If you don't need support for Python3 scripts in the
> Proxmark3 client, you can skip the installation of `libpython3-dev`.
> * If you don't need support for NFC ePaper devices in the