Skip to content

Commit

Permalink
fix(feg): replace golang package repository (magma#15350)
Browse files Browse the repository at this point in the history
* fix(feg): replace golang package repository

Signed-off-by: mehul-jindal <[email protected]>

* fix(workflows): Allow GO v1.21.0 through Golang version check for Dockerfiles

Signed-off-by: mehul-jindal <[email protected]>

---------

Signed-off-by: mehul-jindal <[email protected]>
  • Loading branch information
mehul-jindal authored Dec 6, 2023
1 parent 5d857de commit 11811e9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scripts/golang_check_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ do
while read -r line;
do
version=$(echo "$line" | awk -F '"' '{print $2}')
if [[ -n $version && $version != "$expected_version" ]]
if [[ -n $version && $version != "$expected_version" && $version != "1.21.0" ]]
then
echo "Found unexpected Go version $version in file $(realpath --relative-to="$MAGMA_ROOT" "$file"):"
echo "$line"
Expand Down
4 changes: 2 additions & 2 deletions feg/gateway/docker/go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ RUN apt-get update && apt-get install -y \

# Golang
WORKDIR /usr/local
ARG GOLANG_VERSION="1.20.1"
ARG GOLANG_VERSION="1.21.0"
RUN GO_TARBALL="go${GOLANG_VERSION}.linux-amd64.tar.gz" \
&& curl https://linuxfoundation.jfrog.io/artifactory/magma-blob/${GO_TARBALL} --remote-name --location \
&& curl https://golang.org/dl/${GO_TARBALL} --remote-name --location \
&& tar -xzf ${GO_TARBALL} \
&& ln -s /usr/local/go/bin/go /usr/local/bin/go \
&& ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt \
Expand Down

0 comments on commit 11811e9

Please sign in to comment.