Skip to content

Commit

Permalink
Merge pull request #7766 from thaJeztah/1.6_update_go_1.18.9
Browse files Browse the repository at this point in the history
[release/1.6] update to go1.18.9
  • Loading branch information
estesp committed Dec 7, 2022
2 parents d986545 + 9743dba commit 52a4492
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test-images.yml
Expand Up @@ -39,7 +39,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'

- uses: actions/checkout@v2
with:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
go-version: [1.18.8]
go-version: [1.18.9]
os: [ubuntu-18.04, macos-12, windows-2019]

steps:
Expand All @@ -46,7 +46,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'
- uses: actions/checkout@v2
- run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1
- run: make man
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'
- uses: actions/checkout@v2
- run: |
set -e -x
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04, macos-12, windows-2019, windows-2022]
go-version: ['1.17.13', '1.18.8']
go-version: ['1.17.13', '1.18.9']

steps:
- uses: actions/setup-go@v2
Expand Down Expand Up @@ -262,7 +262,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -352,7 +352,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'

- uses: actions/checkout@v2

Expand Down Expand Up @@ -475,7 +475,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'
- uses: actions/checkout@v2
- run: sudo -E PATH=$PATH script/setup/install-gotestsum
- name: Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: actions/setup-go@v2
with:
go-version: 1.18.8
go-version: 1.18.9

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/images.yml
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'

- uses: actions/checkout@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.18.8'
go-version: '1.18.9'

- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -111,7 +111,7 @@ jobs:
find ./releases/ -maxdepth 1 -type l | xargs rm
working-directory: src/github.com/containerd/containerd
env:
GO_VERSION: '1.18.8'
GO_VERSION: '1.18.9'
PLATFORM: ${{ matrix.platform }}
- name: Save Artifacts
uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Expand Up @@ -91,7 +91,7 @@ EOF
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.18.8",
'GO_VERSION': ENV['GO_VERSION'] || "1.18.9",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash
Expand Down
2 changes: 1 addition & 1 deletion contrib/Dockerfile.test
Expand Up @@ -10,7 +10,7 @@
#
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../

ARG GOLANG_VERSION=1.18.8
ARG GOLANG_VERSION=1.18.9
ARG GOLANG_IMAGE=golang

FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang
Expand Down
2 changes: 1 addition & 1 deletion script/setup/prepare_env_windows.ps1
@@ -1,6 +1,6 @@
# Prepare windows environment for building and running containerd tests

$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.18.8"; make = ""; nssm = "" }
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.18.9"; make = ""; nssm = "" }

Write-Host "Downloading chocolatey package"
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'
Expand Down

0 comments on commit 52a4492

Please sign in to comment.