Skip to content

Commit

Permalink
Merge pull request #84 from secretflow/tk/go
Browse files Browse the repository at this point in the history
update go to version 1.23.1
  • Loading branch information
tongke6 authored Sep 20, 2024
2 parents ba3e271 + 63bde5b commit 2330a00
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
8 changes: 4 additions & 4 deletions dockerfiles/release-ci-aarch64.DockerFile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ RUN /root/miniforge3/bin/conda install -c conda-forge lld nasm cmake gxx==11.4.0
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y

# install go
ARG GO_VERSION=1.22.4
ARG GO_SHA256SUM=a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771
ARG GO_VERSION=1.23.1
ARG GO_SHA256SUM=faec7f7f8ae53fda0f3d408f52182d942cc89ef5b7d3d9f23ff117437d4b2d2f
RUN url="https://golang.google.cn/dl/go${GO_VERSION}.linux-arm64.tar.gz"; \
wget --no-check-certificate -O go.tgz "$url"; \
echo "${GO_SHA256SUM} *go.tgz" | sha256sum -c -; \
Expand All @@ -42,10 +42,10 @@ RUN url="https://golang.google.cn/dl/go${GO_VERSION}.linux-arm64.tar.gz"; \
ENV GOPATH="/usr/local"
ENV PATH="/usr/local/go/bin:${GOPATH}/bin:${PATH}"

# install bazel
# install bazel
RUN wget https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-arm64 \
&& mv bazelisk-linux-arm64 /usr/bin/bazel \
&& chmod +x /usr/bin/bazel
&& chmod +x /usr/bin/bazel

# run as root for now
WORKDIR /home/admin/
Expand Down
8 changes: 4 additions & 4 deletions dockerfiles/release-ci.DockerFile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ RUN /root/miniconda3/bin/conda install -c conda-forge lld nasm cmake gxx==11.4.0
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y

# install go
ARG GO_VERSION=1.22.4
ARG GO_SHA256SUM="ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d"
ARG GO_VERSION=1.23.1
ARG GO_SHA256SUM="49bbb517cfa9eee677e1e7897f7cf9cfdbcf49e05f61984a2789136de359f9bd"
RUN url="https://golang.google.cn/dl/go${GO_VERSION}.linux-amd64.tar.gz"; \
wget --no-check-certificate -O go.tgz "$url"; \
echo "${GO_SHA256SUM} *go.tgz" | sha256sum -c -; \
Expand All @@ -42,10 +42,10 @@ RUN url="https://golang.google.cn/dl/go${GO_VERSION}.linux-amd64.tar.gz"; \
ENV GOPATH="/usr/local"
ENV PATH="/usr/local/go/bin:${GOPATH}/bin:${PATH}"

# install bazel
# install bazel
RUN wget https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64 \
&& mv bazelisk-linux-amd64 /usr/bin/bazel \
&& chmod +x /usr/bin/bazel
&& chmod +x /usr/bin/bazel

# run as root for now
WORKDIR /home/admin/
Expand Down
7 changes: 3 additions & 4 deletions dockerfiles/scql-ci.DockerFile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ FROM secretflow/ubuntu-base-ci:latest

ARG TARGETPLATFORM

ARG GO_VERSION=1.22.4
ARG GO_VERSION=1.23.1

# install go
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; \
then \
GO_ARCH=arm64 && \
GO_SHA256SUM=a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771 ; \
GO_SHA256SUM=faec7f7f8ae53fda0f3d408f52182d942cc89ef5b7d3d9f23ff117437d4b2d2f ; \
else \
GO_ARCH=amd64 && \
GO_SHA256SUM=ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d ; \
GO_SHA256SUM=49bbb517cfa9eee677e1e7897f7cf9cfdbcf49e05f61984a2789136de359f9bd ; \
fi \
&& url="https://golang.google.cn/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz"; \
wget --no-check-certificate -O go.tgz "$url"; \
Expand All @@ -26,4 +26,3 @@ RUN apt update \
&& apt upgrade -y \
&& apt install -y protobuf-compiler \
&& apt clean

0 comments on commit 2330a00

Please sign in to comment.