Skip to content

use python3.7 install script in ci-qemu #10799

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

Merged
masahi merged 4 commits into from
Mar 28, 2022
Merged

use python3.7 install script in ci-qemu #10799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
812dc0b
use python3.7 install script in ci-qemu
t-vi Mar 28, 2022
efeecaa
update pyton venv to 3.7
t-vi Mar 28, 2022
5e125f2
setuptools is just python3...
t-vi Mar 28, 2022
0a79ba7
don't use apt-add-repository (breaks with python3.7 as python3 on ubu…
t-vi Mar 28, 2022
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
3 changes: 3 additions & 0 deletions docker/Dockerfile.ci_qemu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ RUN apt-get update --fix-missing
COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
RUN bash /install/ubuntu_install_core.sh

COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
RUN bash /install/ubuntu1804_install_python.sh

COPY install/ubuntu1804_install_python_venv.sh /install/ubuntu1804_install_python_venv.sh
RUN bash /install/ubuntu1804_install_python_venv.sh
ENV PATH=/opt/tvm-venv/bin:/opt/zephyr-sdk/sysroots/x86_64-pokysdk-linux/usr/bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion docker/install/ubuntu1804_install_python_venv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set -o pipefail
# install python and pip, don't modify this, modify install_python_package.sh
apt-get update
apt-get install -y software-properties-common
apt-get install -y python3-dev python3-setuptools python3-venv
apt-get install -y python3.7-dev python3-setuptools python3.7-venv

python3 -mvenv /opt/tvm-venv

Expand Down
3 changes: 2 additions & 1 deletion docker/install/ubuntu_install_zephyr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ sudo apt-get install -y --no-install-recommends \
wget --no-verbose https://apt.kitware.com/keys/kitware-archive-latest.asc
sudo apt-key add kitware-archive-latest.asc

sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
echo deb https://apt.kitware.com/ubuntu/ bionic main\
>> /etc/apt/sources.list.d/kitware.list
sudo apt-get update

sudo apt-get install -y cmake
Expand Down