Skip to content

Commit a93104d

Browse files
committed
Use ubuntu instead of gcc based images
- also remove unneeded "pydebug.h" include -> fixes commontk#81
1 parent 077cf14 commit a93104d

File tree

6 files changed

+13
-21
lines changed

6 files changed

+13
-21
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
runs-on: [ubuntu-latest]
20-
docker-image: [gcc7, gcc11, centos7]
20+
docker-image: [centos7, ubuntu2004, ubuntu2204]
2121

2222
steps:
2323
- uses: actions/checkout@v3

.github/workflows/dockerfiles/Dockerfile_centos7

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@ RUN yum install -y \
88
qt5-qtbase-* \
99
qt5-qttools* \
1010
qt5-qtsvg \
11-
qt5-qtsvg-devel \
1211
qt5-qtxmlpatterns \
13-
qt5-qtxmlpatterns-devel \
1412
qt5-qtmultimedia \
15-
qt5-qtmultimedia-devel \
1613
qt5-qt3d \
17-
qt5-qt3d-devel
14+
qt5-*-devel
1815

1916
RUN mkdir -p work
2017

.github/workflows/dockerfiles/Dockerfile_gcc11 .github/workflows/dockerfiles/Dockerfile_ubuntu2004

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
FROM gcc:11
1+
FROM ubuntu:20.04
22

3-
RUN apt-get update && apt-get install -y --force-yes \
3+
RUN apt-get update
4+
5+
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes \
6+
build-essential \
47
python3 \
58
python3-dev \
69
libpython3-dev \
710
qtbase5-dev \
811
qtbase5-private-dev \
9-
qtchooser \
1012
qt5-qmake \
1113
qtbase5-dev-tools \
1214
qttools5-dev \

.github/workflows/dockerfiles/Dockerfile_gcc7 .github/workflows/dockerfiles/Dockerfile_ubuntu2204

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
FROM gcc:7
1+
FROM ubuntu:22.04
22

3-
RUN apt-get update && apt-get install -y --force-yes \
3+
RUN apt-get update
4+
5+
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes \
6+
build-essential \
47
python3 \
58
python3-dev \
69
libpython3-dev \
710
qtbase5-dev \
811
qtbase5-private-dev \
9-
qtchooser \
1012
qt5-qmake \
1113
qtbase5-dev-tools \
1214
qttools5-dev \
@@ -33,7 +35,7 @@ RUN uname -a; gcc --version | grep "gcc"; python3 --version; qmake --version
3335

3436
RUN qmake -r PythonQt.pro \
3537
PYTHON_VERSION=$(python3 --version | cut -d " " -f 2 | cut -d "." -f1,2) \
36-
PYTHON_DIR=$(which python3 | xargs dirname | xargs dirname)
38+
PYTHON_DIR=$(which python3 | xargs dirname | xargs dirname)
3739
RUN make
3840

3941
# 2. generate wrappers using the built generator

.idea/.gitignore

-8
This file was deleted.

src/PythonQt.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858

5959
#include <QDir>
6060

61-
#include <pydebug.h>
6261
#include <vector>
6362

6463
PythonQt* PythonQt::_self = nullptr;

0 commit comments

Comments
 (0)