From 366a65a7bbae0cdfcfc92719c0ec39190fa85cfe Mon Sep 17 00:00:00 2001 From: NadeemYaseen <70559777+NadeemYaseen@users.noreply.github.com> Date: Mon, 15 Apr 2024 15:55:30 +0500 Subject: [PATCH 1/9] Update install_centos_dependencies_build.sh to install python3.8 --- .github/workflows/install_centos_dependencies_build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/install_centos_dependencies_build.sh b/.github/workflows/install_centos_dependencies_build.sh index a958a1176..faa71efea 100644 --- a/.github/workflows/install_centos_dependencies_build.sh +++ b/.github/workflows/install_centos_dependencies_build.sh @@ -48,4 +48,11 @@ 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 +ln -sf python3.8/bin/python3.8 /usr/bin/python3 +ln -sf python3.8/include/python3.8 /usr/include/python3.8 +cd /usr/lib64/ && ln -sf /python3.8/lib/libpython3.8.* . && cd - +cd /usr/lib64/ && ln -sf /python3.8/lib/python3.8 . && cd - + yum clean all From 5eb9920ff03b50a1b7a72cf5b54ef160f1942b45 Mon Sep 17 00:00:00 2001 From: NadeemYaseen Date: Mon, 15 Apr 2024 10:56:40 +0000 Subject: [PATCH 2/9] Incremented patch version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b0604c2b3a6a499e96a4a473f11ebb6c680db411 Mon Sep 17 00:00:00 2001 From: NadeemYaseen <70559777+NadeemYaseen@users.noreply.github.com> Date: Mon, 15 Apr 2024 17:01:40 +0500 Subject: [PATCH 3/9] Update main.yml to show centos has python 3.8 --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) 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' From 326648987ce56038ac81e8ad23b06f47074f0601 Mon Sep 17 00:00:00 2001 From: NadeemYaseen <70559777+NadeemYaseen@users.noreply.github.com> Date: Mon, 15 Apr 2024 17:07:27 +0500 Subject: [PATCH 4/9] Update install_centos_dependencies_build.sh --- .github/workflows/install_centos_dependencies_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/install_centos_dependencies_build.sh b/.github/workflows/install_centos_dependencies_build.sh index faa71efea..3feed6082 100644 --- a/.github/workflows/install_centos_dependencies_build.sh +++ b/.github/workflows/install_centos_dependencies_build.sh @@ -50,8 +50,8 @@ 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 -ln -sf python3.8/bin/python3.8 /usr/bin/python3 -ln -sf python3.8/include/python3.8 /usr/include/python3.8 +ln -sf /python3.8/bin/python3.8 /usr/bin/python3 +ln -sf /python3.8/include/python3.8 /usr/include/python3.8 cd /usr/lib64/ && ln -sf /python3.8/lib/libpython3.8.* . && cd - cd /usr/lib64/ && ln -sf /python3.8/lib/python3.8 . && cd - From a3310c6cf6d85a5916701a28ebb6f8296656c3b4 Mon Sep 17 00:00:00 2001 From: NadeemYaseen Date: Mon, 15 Apr 2024 09:02:04 -0700 Subject: [PATCH 5/9] place python in /opt --- .github/workflows/Dockerfile | 2 +- .github/workflows/install_centos_dependencies_build.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) 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 3feed6082..4546f2d0e 100644 --- a/.github/workflows/install_centos_dependencies_build.sh +++ b/.github/workflows/install_centos_dependencies_build.sh @@ -50,9 +50,6 @@ 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 -ln -sf /python3.8/bin/python3.8 /usr/bin/python3 -ln -sf /python3.8/include/python3.8 /usr/include/python3.8 -cd /usr/lib64/ && ln -sf /python3.8/lib/libpython3.8.* . && cd - -cd /usr/lib64/ && ln -sf /python3.8/lib/python3.8 . && cd - +mv python3.8 /opt yum clean all From 93f2538ee9ebfb1b3aebf78148a6bbe492e074fd Mon Sep 17 00:00:00 2001 From: NadeemYaseen Date: Mon, 15 Apr 2024 10:13:29 -0700 Subject: [PATCH 6/9] install coreutil in centos --- .github/workflows/install_centos_dependencies_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/install_centos_dependencies_build.sh b/.github/workflows/install_centos_dependencies_build.sh index 4546f2d0e..fae6a0237 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 From efd5276973d8b8b6dcfa6b3a10978dcbd90cbf8a Mon Sep 17 00:00:00 2001 From: NadeemYaseen <70559777+NadeemYaseen@users.noreply.github.com> Date: Mon, 15 Apr 2024 23:04:12 +0500 Subject: [PATCH 7/9] Update main.yml to debug --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc6ff07bd..a7d2d171a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -202,7 +202,11 @@ jobs: cd $HOME export LD_LIBRARY_PATH=$HOME/dbuild/bin/gtkwave/lib:$HOME/third_party/openssl:$LD_LIBRARY_PATH make debug test/unittest-d - make release test/batch + realpath --help + dirname --help + echo $PATH + make release + make test/batch - name: Test/gui if: matrix.mode == 'test/gui' From a3e2f653914fcd6bdbc7d31e8fdb0c04b02d2775 Mon Sep 17 00:00:00 2001 From: NadeemYaseen <70559777+NadeemYaseen@users.noreply.github.com> Date: Mon, 15 Apr 2024 23:45:28 +0500 Subject: [PATCH 8/9] Update main.yml to correct the symbolic link --- .github/workflows/main.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a7d2d171a..43a942652 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -202,11 +202,8 @@ jobs: cd $HOME export LD_LIBRARY_PATH=$HOME/dbuild/bin/gtkwave/lib:$HOME/third_party/openssl:$LD_LIBRARY_PATH make debug test/unittest-d - realpath --help - dirname --help - echo $PATH - make release - make test/batch + rm /opt/python3.8/bin/python3 && ln -sf /opt/python3.8/bin/python3.8 /opt/python3.8/bin/python3 + make release test/batch - name: Test/gui if: matrix.mode == 'test/gui' From e1d4b2c2f75ce4dc8965b3c6498734c5acf15c6d Mon Sep 17 00:00:00 2001 From: NadeemYaseen Date: Mon, 15 Apr 2024 12:16:19 -0700 Subject: [PATCH 9/9] use python binary directly --- .github/workflows/install_centos_dependencies_build.sh | 1 + .github/workflows/main.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/install_centos_dependencies_build.sh b/.github/workflows/install_centos_dependencies_build.sh index fae6a0237..56e2ac801 100644 --- a/.github/workflows/install_centos_dependencies_build.sh +++ b/.github/workflows/install_centos_dependencies_build.sh @@ -51,5 +51,6 @@ 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 43a942652..fc6ff07bd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -202,7 +202,6 @@ jobs: cd $HOME export LD_LIBRARY_PATH=$HOME/dbuild/bin/gtkwave/lib:$HOME/third_party/openssl:$LD_LIBRARY_PATH make debug test/unittest-d - rm /opt/python3.8/bin/python3 && ln -sf /opt/python3.8/bin/python3.8 /opt/python3.8/bin/python3 make release test/batch - name: Test/gui