You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by me...@apache.org on 2023/01/06 23:02:39 UTC
[tvm] 01/01: Update nrfjprog script and LLVM script
This is an automated email from the ASF dual-hosted git repository.
mehrdadh pushed a commit to branch ci/update_cortexm_ubuntu20
in repository https://gitbox.apache.org/repos/asf/tvm.git
commit a6bc1719dd93e828b08b48e4552191fc3a207076
Author: Mehrdad Hessar <mh...@octoml.ai>
AuthorDate: Fri Jan 6 15:02:23 2023 -0800
Update nrfjprog script and LLVM script
---
docker/Dockerfile.ci_cortexm | 6 ++---
...tall_nrfjprog.sh => ubuntu2004_install_llvm.sh} | 27 +++++++---------------
docker/install/ubuntu_install_nrfjprog.sh | 19 +++++++++------
3 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/docker/Dockerfile.ci_cortexm b/docker/Dockerfile.ci_cortexm
index 29a19454a9..346c24c9df 100644
--- a/docker/Dockerfile.ci_cortexm
+++ b/docker/Dockerfile.ci_cortexm
@@ -17,7 +17,7 @@
# CI docker CPU env
# tag: v0.62
-FROM ubuntu:18.04
+FROM ubuntu:20.04
COPY utils/apt-install-and-clear.sh /usr/local/bin/apt-install-and-clear
@@ -45,8 +45,8 @@ ENV PYTHONNOUSERSITE 1 # Disable .local directory from affecting CI.
COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh
RUN bash /install/ubuntu_install_python_package.sh
-COPY install/ubuntu1804_install_llvm.sh /install/ubuntu1804_install_llvm.sh
-RUN bash /install/ubuntu1804_install_llvm.sh
+COPY install/ubuntu2004_install_llvm.sh /install/ubuntu2004_install_llvm.sh
+RUN bash /install/ubuntu2004_install_llvm.sh
# Rust env (build early; takes a while)
COPY install/ubuntu_install_rust.sh /install/ubuntu_install_rust.sh
diff --git a/docker/install/ubuntu_install_nrfjprog.sh b/docker/install/ubuntu2004_install_llvm.sh
similarity index 50%
copy from docker/install/ubuntu_install_nrfjprog.sh
copy to docker/install/ubuntu2004_install_llvm.sh
index 1a82f057a9..4743f9e87d 100755
--- a/docker/install/ubuntu_install_nrfjprog.sh
+++ b/docker/install/ubuntu2004_install_llvm.sh
@@ -16,24 +16,13 @@
# specific language governing permissions and limitations
# under the License.
-set -e
-set -u
-set -o pipefail
-set -x
+set -euxo pipefail
-NRF_COMMANDLINE_TOOLS_FILE=nRFCommandLineToolsLinuxamd64.tar.gz
-NRF_COMMANDLINE_TOOLS_URL=https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-12-1/nrfcommandlinetools10121linuxamd64.tar.gz
-NRF_COMMANDLINE_TOOLS_INSTALLER=nRF-Command-Line-Tools_10_12_1_Linux-amd64.deb
-JLINK_LINUX_INSTALLER=JLink_Linux_V688a_x86_64.deb
+wget https://apt.llvm.org/llvm.sh
+chmod +x llvm.sh
-cd ~
-mkdir -p nrfjprog
-wget --no-verbose -O $NRF_COMMANDLINE_TOOLS_FILE $NRF_COMMANDLINE_TOOLS_URL
-
-cd nrfjprog
-tar -xzvf "../${NRF_COMMANDLINE_TOOLS_FILE}"
-apt-install-and-clear -y "./${JLINK_LINUX_INSTALLER}"
-apt-install-and-clear -y "./${NRF_COMMANDLINE_TOOLS_INSTALLER}"
-
-cd ..
-rm -rf nrfjprog "${NRF_COMMANDLINE_TOOLS_FILE}"
+./llvm.sh 9
+./llvm.sh 10
+./llvm.sh 11
+./llvm.sh 12
+./llvm.sh 13
diff --git a/docker/install/ubuntu_install_nrfjprog.sh b/docker/install/ubuntu_install_nrfjprog.sh
index 1a82f057a9..6c23d547aa 100755
--- a/docker/install/ubuntu_install_nrfjprog.sh
+++ b/docker/install/ubuntu_install_nrfjprog.sh
@@ -21,19 +21,24 @@ set -u
set -o pipefail
set -x
+TEMP_PATH_NAME="nrfjprog_tmp_path"
+
+# Install JLink
NRF_COMMANDLINE_TOOLS_FILE=nRFCommandLineToolsLinuxamd64.tar.gz
-NRF_COMMANDLINE_TOOLS_URL=https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-12-1/nrfcommandlinetools10121linuxamd64.tar.gz
-NRF_COMMANDLINE_TOOLS_INSTALLER=nRF-Command-Line-Tools_10_12_1_Linux-amd64.deb
-JLINK_LINUX_INSTALLER=JLink_Linux_V688a_x86_64.deb
+NRF_COMMANDLINE_TOOLS_URL=https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-18-1/nrf-command-line-tools-10.18.1_linux-amd64.tar.gz
+JLINK_LINUX_INSTALLER=JLink_Linux_V780c_x86_64.deb
cd ~
-mkdir -p nrfjprog
+mkdir -p ${TEMP_PATH_NAME}
wget --no-verbose -O $NRF_COMMANDLINE_TOOLS_FILE $NRF_COMMANDLINE_TOOLS_URL
-cd nrfjprog
+cd ${TEMP_PATH_NAME}
tar -xzvf "../${NRF_COMMANDLINE_TOOLS_FILE}"
apt-install-and-clear -y "./${JLINK_LINUX_INSTALLER}"
-apt-install-and-clear -y "./${NRF_COMMANDLINE_TOOLS_INSTALLER}"
+
+# Install nrfjprog
+wget --no-verbose https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-18-1/nrf-command-line-tools_10.18.1_amd64.deb
+apt-install-and-clear -y ./nrf-command-line-tools_10.18.1_amd64.deb
cd ..
-rm -rf nrfjprog "${NRF_COMMANDLINE_TOOLS_FILE}"
+rm -rf ${TEMP_PATH_NAME} "${NRF_COMMANDLINE_TOOLS_FILE}"