diff --git a/docker/build/installers/install_bazel.sh b/docker/build/installers/install_bazel.sh index e656f897be117a2f39ee1a6348d4e06c0f53d308..19d55b0b457b3a1b4622291848e17e1f68900895 100755 --- a/docker/build/installers/install_bazel.sh +++ b/docker/build/installers/install_bazel.sh @@ -25,9 +25,10 @@ cd "$(dirname "${BASH_SOURCE[0]}")" TARGET_ARCH=$(uname -m) +BAZEL_VERSION="3.4.1" + if [ "$TARGET_ARCH" == "x86_64" ]; then # https://docs.bazel.build/versions/master/install-ubuntu.html - BAZEL_VERSION="3.4.1" PKG_NAME="bazel_${BAZEL_VERSION}-linux-x86_64.deb" DOWNLOAD_LINK=https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${PKG_NAME} SHA256SUM="1a64c807716e10c872f1618852d95f4893d81667fe6e691ef696489103c9b460" @@ -65,13 +66,10 @@ if [ "$TARGET_ARCH" == "x86_64" ]; then info "Done installing bazel ${BAZEL_VERSION} with buildifier and buildozer" elif [ "$TARGET_ARCH" == "aarch64" ]; then - BAZEL_VERSION="3.4.0" - # Ref: https://docs.bazel.build/versions/master/install-compile-source.html - # Ref: https://github.com/storypku/storydev/blob/master/bazel-build/build-bazel-from-source.md - # Download Mode ARM64_BINARY="bazel-${BAZEL_VERSION}-linux-arm64" + CHECKSUM="07955cbef922b51025577df4e258d5dfc4f7adc5ec8ab110dedb411878d63627" DOWNLOAD_LINK="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${ARM64_BINARY}" - CHECKSUM="440672f319be239d7dd5d7c5062edee23499dd49b49e89cc26dc9d44aa044a96" + # https://github.com/bazelbuild/bazel/releases/download/3.4.1/bazel-3.4.1-linux-arm64 download_if_not_cached "${ARM64_BINARY}" "${CHECKSUM}" "${DOWNLOAD_LINK}" chmod a+x ${ARM64_BINARY} cp -f ${ARM64_BINARY} "${SYSROOT_DIR}/bin/bazel" diff --git a/docker/scripts/cyber_start.sh b/docker/scripts/cyber_start.sh index 1759d40661c96d6188df3c0602dc001587212855..060914d4f75d5868e5106a51732c19412ea42596 100644 --- a/docker/scripts/cyber_start.sh +++ b/docker/scripts/cyber_start.sh @@ -22,7 +22,7 @@ source "${APOLLO_ROOT_DIR}/scripts/apollo.bashrc" VERSION_X86_64="cyber-x86_64-18.04-20200707_1716" # ARMV8 -# VERSION_AARCH64="cyber-aarch64-18.04-20200714_1859" +# VERSION_AARCH64="cyber-aarch64-18.04-20200717_0327" # L4T VERSION_AARCH64="cyber-aarch64-18.04-20200703_2150" VERSION_LOCAL_CYBER="local_cyber_dev"