From 9a8a9fe300c829ed292d4bb97d8626c3077f6b25 Mon Sep 17 00:00:00 2001 From: Nick Neisen Date: Fri, 8 Mar 2024 10:07:41 -0700 Subject: [PATCH] Bump the go version to 1.21.8 (#332) --- .github/.env | 2 +- .github/workflows/integration.yml | 2 +- scripts/setup-el | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/.env b/.github/.env index 4ca75c674..4f0871aaf 100644 --- a/.github/.env +++ b/.github/.env @@ -1,3 +1,3 @@ -GO_VERSION=1.21.3 +GO_VERSION=1.21.8 HUGO_VERSION=0.114.0 LIMA_VERSION=0.20.1 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 0fb89b37d..9e3cddfea 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -187,7 +187,7 @@ jobs: cat ~/.lima/default/ssh.config >> ~/.ssh/config - run: rsync -a -e ssh src/github.com/Mirantis/cri-dockerd/ lima-default:/tmp/cri-dockerd - - run: ssh lima-default sudo /tmp/cri-dockerd/scripts/setup-el + - run: ssh lima-default sudo /tmp/cri-dockerd/scripts/setup-el ${{ env.GO_VERSION }} - run: ssh lima-default "export PATH=$PATH:/usr/local/go/bin && make -C /tmp/cri-dockerd cri-dockerd" - run: ssh -f lima-default sudo /tmp/cri-dockerd/cri-dockerd --network-plugin="" & - run: ssh lima-default sudo /usr/local/bin/critest -runtime-endpoint=unix:///var/run/cri-dockerd.sock -ginkgo.focus='.*selinux.*' -ginkgo.v diff --git a/scripts/setup-el b/scripts/setup-el index 344ca3a9d..c811d76a4 100755 --- a/scripts/setup-el +++ b/scripts/setup-el @@ -11,8 +11,8 @@ cat </etc/docker/daemon.json EOF echo "Installing Golang" -curl -O https://dl.google.com/go/go1.22.1.linux-amd64.tar.gz -sudo tar -C /usr/local -xzf go1.22.1.linux-amd64.tar.gz +curl -O https://dl.google.com/go/go${1}.linux-amd64.tar.gz +sudo tar -C /usr/local -xzf go${1}.linux-amd64.tar.gz export PATH=$PATH:/usr/local/go/bin echo "Installing other dependencies"