diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index 8416475f4..36dfb6c84 100644 --- a/.github/workflows/Dockerfile +++ b/.github/workflows/Dockerfile @@ -7,7 +7,7 @@ ENV CC=/opt/rh/devtoolset-11/root/usr/bin/gcc ENV CXX=/opt/rh/devtoolset-11/root/usr/bin/g++ ENV QMAKE_CC='/opt/rh/devtoolset-11/root/usr/bin/gcc' ENV QMAKE_CXX='/opt/rh/devtoolset-11/root/usr/bin/g++' -ENV PATH="/usr/local/Qt6.2.4/bin:/usr/lib/ccache:$PATH" +ENV PATH="/opt/python3.8/bin:/usr/local/Qt6.2.4/bin:/usr/lib/ccache:$PATH" ENV PREFIX=/tmp/foedag-install ENV ADDITIONAL_CMAKE_OPTIONS='-DMY_CXX_WARNING_FLAGS="-W -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Werror -UNDEBUG"' ENV RULE_MESSAGES=off diff --git a/.github/workflows/install_centos_dependencies_build.sh b/.github/workflows/install_centos_dependencies_build.sh index a958a1176..56e2ac801 100644 --- a/.github/workflows/install_centos_dependencies_build.sh +++ b/.github/workflows/install_centos_dependencies_build.sh @@ -28,7 +28,7 @@ yum install -y libxcb libxcb-devel xcb-util xcb-util-devel libxkbcommon-devel li yum install -y xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel compat-libxcb compat-libxcb-devel xcb-util-cursor xcb-util-cursor-devel yum install -y gtk3-devel zip unzip yum install -y libusbx-devel libusb-devel -yum install -y pkgconfig +yum install -y pkgconfig coreutils yum install -y perl-IPC-Cmd yum install -y alsa-lib mesa-dri-drivers openssl openssl-devel sudo yum install -y python3-devel bzip2-devel libffi-devel @@ -48,4 +48,9 @@ else exit 2 fi +wget https://github.com/os-fpga/post_build_artifacts/releases/download/v0.1/python3.8_static_zlib_8march_2023.tar.gz -O python.tar.gz +tar -xzf python.tar.gz +mv python3.8 /opt +rm /opt/python3.8/bin/python3 && ln -sf /opt/python3.8/bin/python3.8 /opt/python3.8/bin/python3 + yum clean all diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 01cd244e1..fc6ff07bd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -189,6 +189,7 @@ jobs: source /opt/rh/devtoolset-11/enable which gcc which g++ + python3 -V - name: Test/batch if: matrix.mode == 'test/batch' diff --git a/CMakeLists.txt b/CMakeLists.txt index b7393443c..6e890de93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ set(VERSION_MINOR 0) # Add the spdlog directory to the include path include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/third_party/exprtk) -set(VERSION_PATCH 348) +set(VERSION_PATCH 349) option( WITH_LIBCXX