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

Merge pull request #6822 from thaJeztah/bump_golang_1.18.1

Browse Source 
update golang to 1.18.1, 1.17.9
This commit is contained in:
Phil Estes
2022-04-19 14:17:55 +01:00
committed by GitHub
parent be60973a30 dbdf50cc09
commit 22655d4583
11 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

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

@@ -20,7 +20,7 @@ jobs:
strategy: strategy:
matrix: matrix:
go-version: [1.18.0] go-version: [1.18.1]
os: [ubuntu-18.04, macos-10.15, windows-2019] os: [ubuntu-18.04, macos-10.15, windows-2019]
steps: steps:
@@ -46,7 +46,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@@ -78,7 +78,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@@ -110,7 +110,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1 - run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1
- run: make man - run: make man
@@ -144,7 +144,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: | - run: |
set -e -x set -e -x
@@ -201,7 +201,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022] os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022]
go-version: ['1.17.8', '1.18.0'] go-version: ['1.17.9', '1.18.1']
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
@@ -247,7 +247,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@@ -375,7 +375,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@@ -494,7 +494,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: sudo -E PATH=$PATH script/setup/install-gotestsum - run: sudo -E PATH=$PATH script/setup/install-gotestsum
- name: Tests - name: Tests

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

@@ -26,7 +26,7 @@ jobs:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: 1.18.0 go-version: 1.18.1
# 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

@@ -24,7 +24,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

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

@@ -18,7 +18,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@@ -135,7 +135,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

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

@@ -64,7 +64,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: '1.18.0' go-version: '1.18.1'
- name: Set env - name: Set env
shell: bash shell: bash
env: env:
@@ -107,7 +107,7 @@ jobs:
find ./releases/ -maxdepth 1 -type l | xargs rm find ./releases/ -maxdepth 1 -type l | xargs rm
working-directory: src/github.com/containerd/containerd working-directory: src/github.com/containerd/containerd
env: env:
GO_VERSION: '1.17.2' GO_VERSION: '1.18.1'
PLATFORM: ${{ matrix.platform }} PLATFORM: ${{ matrix.platform }}
- name: Save Artifacts - name: Save Artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2

2
.zuul/playbooks/containerd-build/integration-test.yaml
View File

@@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.17.4' go_version: '1.18.1'
arch: arm64 arch: arm64
tasks: tasks:
- name: Install pre-requisites - name: Install pre-requisites

2
.zuul/playbooks/containerd-build/run.yaml
View File

@@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.18' go_version: '1.18.1'
arch: arm64 arch: arm64
tasks: tasks:
- name: Build containerd - name: Build containerd

2
.zuul/playbooks/containerd-build/unit-test.yaml
View File

@@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.17.4' go_version: '1.18.1'
arch: arm64 arch: arm64
tasks: tasks:
- name: Build and test containerd - name: Build and test containerd

2
Vagrantfile vendored
View File

@@ -91,7 +91,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.18", 'GO_VERSION': ENV['GO_VERSION'] || "1.18.1",
} }
sh.inline = <<~SHELL sh.inline = <<~SHELL
#!/usr/bin/env bash #!/usr/bin/env bash

2
contrib/Dockerfile.test
View File

@@ -10,7 +10,7 @@
# #
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../ # docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../
ARG GOLANG_VERSION=1.18 ARG GOLANG_VERSION=1.18.1
ARG GOLANG_IMAGE=golang ARG GOLANG_IMAGE=golang
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang