rfidrig/proxmark3
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-12 11:18:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

qt6: some CI & docker tuning

Browse Source
This commit is contained in:
Philippe Teuwen
2026-02-26 18:58:41 +01:00
parent 3f20408b75
commit 9323db291d
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ubuntu.yml
+2 -2
View File
@@ -30,7 +30,7 @@ jobs:
run: sudo apt-get update
- name: Install dependencies
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev qmake6-bin libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
- name: Install Python dependencies
run: pip install -r tools/requirements.txt
@@ -60,7 +60,7 @@ jobs:
run: sudo apt-get update
- name: Install dependencies
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev qmake6-bin libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
- name: Install Python dependencies
run: pip install -r tools/requirements.txt
docker/build.sh
+4
View File
@@ -14,6 +14,10 @@ else
BUILDARG=""
fi
if [ -n "$SKIPQT" ]; then
BUILDARG="$BUILDARG --build-arg SKIPQT=$SKIPQT"
fi
# For cross-platform support:
# cf https://github.com/multiarch/qemu-user-static
#sudo apt install qemu-user-static
docker/debian-13-trixie/Dockerfile
+6 -1
View File
@@ -2,7 +2,6 @@ FROM debian:trixie-slim
ENV LANG=C
ENV DEBIAN_FRONTEND=noninteractive
# qtbase5-dev skipped
RUN apt-get update && \
apt-get upgrade -y && \
apt-get dist-upgrade -y && \
@@ -12,6 +11,12 @@ RUN apt-get update && \
RUN apt-get install -y opencl-dev && \
apt-get clean
ARG SKIPQT=false
RUN if [ "${SKIPQT}" = "false" ]; then \
apt-get install -y qt6-base-dev qmake6-bin && \
apt-get clean; \
fi
# uv
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
docker/debian-13-trixie/docker_conf.inc
+1
View File
@@ -1 +1,2 @@
DOCKER_IMAGE=pm3-debian-trixie:1.0
SKIPQT=1