kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

update to golang 1.19

Browse source 
also ran gofmt with go1.19

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-06-27 11:22:21 +02:00
parent a9fe88e395
commit 58413c15cb
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
7 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/.windows.yml vendored
View file

@ -13,7 +13,10 @@ on:
default: false default: false
env: env:
GO_VERSION: 1.18.6 GO_VERSION: 1.19
# FIXME: temporarily using a separate var for this, as go-setup-action expects SemVer
# see https://github.com/actions/setup-go/tree/v3.2.0#supported-version-syntax
GO_VERSION_SEMVER: 1.19.0
GOTESTLIST_VERSION: v0.2.0 GOTESTLIST_VERSION: v0.2.0
TESTSTAT_VERSION: v0.1.3 TESTSTAT_VERSION: v0.1.3
WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore
@ -187,7 +190,7 @@ jobs:
name: Set up Go name: Set up Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION_SEMVER }}
- -
name: Download artifacts name: Download artifacts
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
@ -215,7 +218,7 @@ jobs:
name: Set up Go name: Set up Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION_SEMVER }}
- -
name: Install gotestlist name: Install gotestlist
run: run:
@ -387,7 +390,7 @@ jobs:
name: Set up Go name: Set up Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION_SEMVER }}
- -
name: Test integration name: Test integration
if: matrix.test == './...' if: matrix.test == './...'
@ -477,7 +480,7 @@ jobs:
name: Set up Go name: Set up Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION_SEMVER }}
- -
name: Download artifacts name: Download artifacts
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3

2
Dockerfile
View file

@ -2,7 +2,7 @@
ARG CROSS="false" ARG CROSS="false"
ARG SYSTEMD="false" ARG SYSTEMD="false"
ARG GO_VERSION=1.18.6 ARG GO_VERSION=1.19
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG VPNKIT_VERSION=0.5.0 ARG VPNKIT_VERSION=0.5.0

2
Dockerfile.e2e
View file

@ -1,4 +1,4 @@
ARG GO_VERSION=1.18.6 ARG GO_VERSION=1.19
FROM golang:${GO_VERSION}-alpine AS base FROM golang:${GO_VERSION}-alpine AS base
ENV GO111MODULE=off ENV GO111MODULE=off

2
Dockerfile.simple
View file

@ -5,7 +5,7 @@
# This represents the bare minimum required to build and test Docker. # This represents the bare minimum required to build and test Docker.
ARG GO_VERSION=1.18.6 ARG GO_VERSION=1.19
ARG BASE_DEBIAN_DISTRO="bullseye" ARG BASE_DEBIAN_DISTRO="bullseye"
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}" ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"

4
Dockerfile.windows
View file

@ -165,10 +165,10 @@ FROM microsoft/windowsservercore
# Use PowerShell as the default shell # Use PowerShell as the default shell
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ARG GO_VERSION=1.18.6 ARG GO_VERSION=1.19
ARG CONTAINERD_VERSION=v1.6.8
ARG GOTESTSUM_VERSION=v1.8.1 ARG GOTESTSUM_VERSION=v1.8.1
ARG GOWINRES_VERSION=v0.2.3 ARG GOWINRES_VERSION=v0.2.3
ARG CONTAINERD_VERSION=v1.6.8
# Environment variable notes: # Environment variable notes:
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux. # - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

1
daemon/content.go
View file

@ -63,6 +63,7 @@ func (cp namespacedContent) Info(ctx context.Context, dgst digest.Digest) (conte
// If one or more fieldpaths are provided, only those // If one or more fieldpaths are provided, only those
// fields will be updated. // fields will be updated.
// Mutable fields: // Mutable fields:
//
// labels.* // labels.*
func (cp namespacedContent) Update(ctx context.Context, info content.Info, fieldpaths ...string) (content.Info, error) { func (cp namespacedContent) Update(ctx context.Context, info content.Info, fieldpaths ...string) (content.Info, error) {
return cp.provider.Update(withDefaultNamespace(ctx, cp.ns), info, fieldpaths...) return cp.provider.Update(withDefaultNamespace(ctx, cp.ns), info, fieldpaths...)