github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7948 from yanggangtony/go-version

Browse Source 
update to go1.19.5, go1.18.10
This commit is contained in:
Fu Wei
2023-01-12 09:58:06 +08:00
committed by GitHub
parent 7d14e6cf25 c8f4ab3b0d
commit bbcfbf2189
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-test-images.yml vendored
View File

@@ -43,7 +43,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:
go-version: "1.19.4" go-version: "1.19.5"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

4
.github/workflows/ci.yml vendored
View File

@@ -12,7 +12,7 @@ on:
env: env:
# Go version we currently use to build containerd across all CI. # Go version we currently use to build containerd across all CI.
# Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions. # Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions.
GO_VERSION: "1.19.4" GO_VERSION: "1.19.5"
permissions: # added using https://github.com/step-security/secure-workflows permissions: # added using https://github.com/step-security/secure-workflows
contents: read contents: read
@@ -239,7 +239,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-20.04, macos-12, windows-2019, windows-2022] os: [ubuntu-20.04, macos-12, windows-2019, windows-2022]
go-version: ["1.19.4", "1.18.9"] go-version: ["1.19.5", "1.18.10"]
steps: steps:
- name: Install dependencies - name: Install dependencies
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-20.04'

2
.github/workflows/codeql.yml vendored
View File

@@ -33,7 +33,7 @@ jobs:
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:
go-version: 1.19.4 go-version: 1.19.5
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

2
.github/workflows/images.yml vendored
View File

@@ -28,7 +28,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:
go-version: "1.19.4" go-version: "1.19.5"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

2
.github/workflows/nightly.yml vendored
View File

@@ -7,7 +7,7 @@ on:
- ".github/workflows/nightly.yml" - ".github/workflows/nightly.yml"
env: env:
GO_VERSION: "1.19.4" GO_VERSION: "1.19.5"
permissions: # added using https://github.com/step-security/secure-workflows permissions: # added using https://github.com/step-security/secure-workflows
contents: read contents: read

2
.github/workflows/release.yml vendored
View File

@@ -6,7 +6,7 @@ on:
name: Containerd Release name: Containerd Release
env: env:
GO_VERSION: "1.19.4" GO_VERSION: "1.19.5"
permissions: # added using https://github.com/step-security/secure-workflows permissions: # added using https://github.com/step-security/secure-workflows
contents: read contents: read

2
Vagrantfile vendored
View File

@@ -101,7 +101,7 @@ EOF
config.vm.provision "install-golang", type: "shell", run: "once" do |sh| config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang" sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = { sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.19.4", 'GO_VERSION': ENV['GO_VERSION'] || "1.19.5",
} }
sh.inline = <<~SHELL sh.inline = <<~SHELL
#!/usr/bin/env bash #!/usr/bin/env bash

2
contrib/Dockerfile.test
View File

@@ -29,7 +29,7 @@
# docker run --privileged containerd-test # docker run --privileged containerd-test
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
ARG GOLANG_VERSION=1.19.4 ARG GOLANG_VERSION=1.19.5
ARG GOLANG_IMAGE=golang ARG GOLANG_IMAGE=golang
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

4
contrib/fuzz/oss_fuzz_build.sh
View File

@@ -43,11 +43,11 @@ go run main.go $SRC/containerd/images
apt-get update && apt-get install -y wget apt-get update && apt-get install -y wget
cd $SRC cd $SRC
wget --quiet https://go.dev/dl/go1.19.4.linux-amd64.tar.gz wget --quiet https://go.dev/dl/go1.19.5.linux-amd64.tar.gz
mkdir temp-go mkdir temp-go
rm -rf /root/.go/* rm -rf /root/.go/*
tar -C temp-go/ -xzf go1.19.4.linux-amd64.tar.gz tar -C temp-go/ -xzf go1.19.5.linux-amd64.tar.gz
mv temp-go/go/* /root/.go/ mv temp-go/go/* /root/.go/
cd $SRC/containerd cd $SRC/containerd

2
script/setup/prepare_env_windows.ps1
View File

@@ -5,7 +5,7 @@
# lived test environment. # lived test environment.
Set-MpPreference -DisableRealtimeMonitoring:$true Set-MpPreference -DisableRealtimeMonitoring:$true
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.19.4"; make = ""; nssm = "" } $PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.19.5"; make = ""; nssm = "" }
Write-Host "Downloading chocolatey package" Write-Host "Downloading chocolatey package"
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip' curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'