Merge pull request #7159 from thaJeztah/bump_go_1.18.4
This commit is contained in:
commit
b3eb85a344
2
.github/workflows/build-test-images.yml
vendored
2
.github/workflows/build-test-images.yml
vendored
@ -39,7 +39,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
|
18
.github/workflows/ci.yml
vendored
18
.github/workflows/ci.yml
vendored
@ -20,7 +20,7 @@ jobs:
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
go-version: [1.18.3]
|
||||
go-version: [1.18.4]
|
||||
os: [ubuntu-18.04, macos-10.15, windows-2019]
|
||||
|
||||
steps:
|
||||
@ -46,7 +46,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
@ -78,7 +78,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
@ -110,7 +110,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
- uses: actions/checkout@v2
|
||||
- run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1
|
||||
- run: make man
|
||||
@ -148,7 +148,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
- uses: actions/checkout@v2
|
||||
- run: |
|
||||
set -e -x
|
||||
@ -215,7 +215,7 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022]
|
||||
go-version: ['1.17.11', '1.18.3']
|
||||
go-version: ['1.17.12', '1.18.4']
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
@ -261,7 +261,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
@ -397,7 +397,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
@ -516,7 +516,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
- uses: actions/checkout@v2
|
||||
- run: sudo -E PATH=$PATH script/setup/install-gotestsum
|
||||
- name: Tests
|
||||
|
2
.github/workflows/codeql.yml
vendored
2
.github/workflows/codeql.yml
vendored
@ -26,7 +26,7 @@ jobs:
|
||||
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: 1.18.3
|
||||
go-version: 1.18.4
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
|
2
.github/workflows/images.yml
vendored
2
.github/workflows/images.yml
vendored
@ -24,7 +24,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
|
4
.github/workflows/nightly.yml
vendored
4
.github/workflows/nightly.yml
vendored
@ -18,7 +18,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
@ -155,7 +155,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
|
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
@ -66,7 +66,7 @@ jobs:
|
||||
- name: Install Go
|
||||
uses: actions/setup-go@v2
|
||||
with:
|
||||
go-version: '1.18.3'
|
||||
go-version: '1.18.4'
|
||||
- name: Set env
|
||||
shell: bash
|
||||
env:
|
||||
@ -109,7 +109,7 @@ jobs:
|
||||
find ./releases/ -maxdepth 1 -type l | xargs rm
|
||||
working-directory: src/github.com/containerd/containerd
|
||||
env:
|
||||
GO_VERSION: '1.18.3'
|
||||
GO_VERSION: '1.18.4'
|
||||
PLATFORM: ${{ matrix.platform }}
|
||||
- name: Save Artifacts
|
||||
uses: actions/upload-artifact@v2
|
||||
|
@ -2,7 +2,7 @@
|
||||
become: yes
|
||||
roles:
|
||||
- role: config-golang
|
||||
go_version: '1.18.3'
|
||||
go_version: '1.18.4'
|
||||
arch: arm64
|
||||
tasks:
|
||||
- name: Install pre-requisites
|
||||
|
@ -2,7 +2,7 @@
|
||||
become: yes
|
||||
roles:
|
||||
- role: config-golang
|
||||
go_version: '1.18.3'
|
||||
go_version: '1.18.4'
|
||||
arch: arm64
|
||||
tasks:
|
||||
- name: Build containerd
|
||||
|
@ -2,7 +2,7 @@
|
||||
become: yes
|
||||
roles:
|
||||
- role: config-golang
|
||||
go_version: '1.18.3'
|
||||
go_version: '1.18.4'
|
||||
arch: arm64
|
||||
tasks:
|
||||
- name: Build and test containerd
|
||||
|
2
Vagrantfile
vendored
2
Vagrantfile
vendored
@ -97,7 +97,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.3",
|
||||
'GO_VERSION': ENV['GO_VERSION'] || "1.18.4",
|
||||
}
|
||||
sh.inline = <<~SHELL
|
||||
#!/usr/bin/env bash
|
||||
|
@ -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.3
|
||||
ARG GOLANG_VERSION=1.18.4
|
||||
ARG GOLANG_IMAGE=golang
|
||||
|
||||
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang
|
||||
|
@ -40,11 +40,11 @@ compile_fuzzers() {
|
||||
|
||||
apt-get update && apt-get install -y wget
|
||||
cd $SRC
|
||||
wget --quiet https://go.dev/dl/go1.18.3.linux-amd64.tar.gz
|
||||
wget --quiet https://go.dev/dl/go1.18.4.linux-amd64.tar.gz
|
||||
|
||||
mkdir temp-go
|
||||
rm -rf /root/.go/*
|
||||
tar -C temp-go/ -xzf go1.18.3.linux-amd64.tar.gz
|
||||
tar -C temp-go/ -xzf go1.18.4.linux-amd64.tar.gz
|
||||
mv temp-go/go/* /root/.go/
|
||||
cd $SRC/containerd
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
# lived test environment.
|
||||
Set-MpPreference -DisableRealtimeMonitoring:$true
|
||||
|
||||
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.18.3"; make = ""; nssm = "" }
|
||||
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.18.4"; make = ""; nssm = "" }
|
||||
|
||||
Write-Host "Downloading chocolatey package"
|
||||
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'
|
||||
|
Loading…
Reference in New Issue
Block a user