From e65921a090b8461a2bca91fcaf74e48dcb07dbf5 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 26 Jul 2022 11:41:27 +0200 Subject: [PATCH] unix/linux: use Go 1.19rc2 instead of building gotip CL 399336 added support for generating linux/loong64 types and constants and CL 406794 switched it to use gotip after support for linux/loong64 was merged. The upcoming Go 1.19 release will support that platform, so switch to use 1.19rc2. Change-Id: Id3be69eb8f04bdf215f248df09bb5da9456494e7 Reviewed-on: https://go-review.googlesource.com/c/sys/+/419395 Run-TryBot: Tobias Klauser TryBot-Result: Gopher Robot Reviewed-by: Cherry Mui Reviewed-by: Ian Lance Taylor --- unix/linux/Dockerfile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/unix/linux/Dockerfile b/unix/linux/Dockerfile index 8893bef8..12889096 100644 --- a/unix/linux/Dockerfile +++ b/unix/linux/Dockerfile @@ -27,9 +27,9 @@ RUN git clone https://github.com/loongson/golang-infra.git /git/loong64-patches && curl -fsSL https://git.savannah.gnu.org/cgit/config.git/plain/config.sub -o /git/glibc/scripts/config.sub # Get Go -ENV GOLANG_VERSION 1.18 +ENV GOLANG_VERSION 1.19rc2 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -ENV GOLANG_DOWNLOAD_SHA256 e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f +ENV GOLANG_DOWNLOAD_SHA256 9130c6f8e87ce9bb4813533a68c3f17c82c7307caf8795d3c9427652b77f81aa RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \ @@ -57,12 +57,6 @@ RUN apt-get update && apt-get install -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# Only for loong64, build Go from master until 1.19 is released -RUN git clone https://go.googlesource.com/go --branch master /git/go \ - && cd /git/go/src && ./make.bash - -ENV PATH /git/go/bin:$PATH - # Only for loong64, getting tools of qemu-user and gcc-cross-compiler RUN apt-get update && apt-get install wget xz-utils -y && mkdir /loong64 && cd /loong64 \ && wget -q https://github.com/loongson/build-tools/releases/download/2021.12.21/qemu-loongarch-2022-4-01.tar.gz \