Skip to content

Commit 595ed22

Browse files
committed
Change CentOS image to use Python 2
1 parent 012f2b6 commit 595ed22

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Build
22

33
on:
44
push:
5-
branches:
6-
- master
5+
# branches:
6+
# - master
77
pull_request:
88

99
defaults:

.github/workflows/dockerfiles/Dockerfile_centos7

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ RUN yum update -y
44
RUN yum groupinstall "Development Tools" -y
55
RUN yum install -y \
66
which \
7-
python3 \
8-
python3-debug \
7+
# python3 \
8+
python-debug \
99
qt5-qtbase-* \
1010
qt5-qttools* \
1111
qt5-qtsvg \
@@ -24,10 +24,10 @@ COPY . work/
2424
WORKDIR work
2525

2626
ARG QT_SELECT=qt5
27-
RUN uname -a; gcc --version | grep "gcc"; python3 --version; qmake-qt5 --version
27+
RUN uname -a; gcc --version | grep "gcc"; python --version; qmake-qt5 --version
2828

2929
RUN qmake-qt5 -r PythonQt.pro \
30-
PYTHON_VERSION=$(python3 --version | cut -d " " -f 2 | cut -d "." -f1,2) \
31-
PYTHON_DIR=$(which python3 | xargs dirname | xargs dirname)
30+
PYTHON_VERSION=$(python --version | cut -d " " -f 2 | cut -d "." -f1,2) \
31+
PYTHON_DIR=$(which python | xargs dirname | xargs dirname)
3232

3333
CMD ["make"]

0 commit comments

Comments
 (0)