Skip to content

Commit

Permalink
Merge branch 'main' into FOEDAG-pll
Browse files Browse the repository at this point in the history
  • Loading branch information
chungshien-chai authored Apr 16, 2024
2 parents 98cd500 + eb06a2a commit c7c593b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Dockerfile
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
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
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

0 comments on commit c7c593b

Please sign in to comment.