Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install python3.8 on All OS #1543

Merged
merged 9 commits into from
Apr 16, 2024
Merged

Install python3.8 on All OS #1543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
366a65a
Update install_centos_dependencies_build.sh to install python3.8
NadeemYaseen Apr 15, 2024
5eb9920
Incremented patch version
NadeemYaseen Apr 15, 2024
b0604c2
Update main.yml to show centos has python 3.8
NadeemYaseen Apr 15, 2024
3266489
Update install_centos_dependencies_build.sh
NadeemYaseen Apr 15, 2024
a3310c6
place python in /opt
NadeemYaseen Apr 15, 2024
93f2538
install coreutil in centos
NadeemYaseen Apr 15, 2024
efd5276
Update main.yml to debug
NadeemYaseen Apr 15, 2024
a3e2f65
Update main.yml to correct the symbolic link
NadeemYaseen Apr 15, 2024
e1d4b2c
use python binary directly
NadeemYaseen Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/install_centos_dependencies_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
1 change: 1 addition & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading