Merge pull request moby#5525 from slonopotamus/legacy-build-tags

Remove pre-Go 1.17 build tags
scope-demo · Nov 21, 2024 · 05ea8c9 · 05ea8c9
2 parents e853c88 + 0a5a80c
commit 05ea8c9
Show file tree

Hide file tree

Showing 121 changed files with 0 additions and 122 deletions.
diff --git a/cache/blobs_linux.go b/cache/blobs_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cache
 

diff --git a/cache/blobs_nolinux.go b/cache/blobs_nolinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package cache
 

diff --git a/cache/compression_nydus.go b/cache/compression_nydus.go
@@ -1,5 +1,4 @@
 //go:build nydus
-// +build nydus
 
 package cache
 

diff --git a/cache/contenthash/checksum_unix.go b/cache/contenthash/checksum_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package contenthash
 

diff --git a/cache/contenthash/filehash_unix.go b/cache/contenthash/filehash_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package contenthash
 

diff --git a/cache/contenthash/filehash_windows.go b/cache/contenthash/filehash_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package contenthash
 

diff --git a/client/client_nydus_test.go b/client/client_nydus_test.go
@@ -1,5 +1,4 @@
 //go:build nydus
-// +build nydus
 
 package client
 

diff --git a/client/mergediff_linux_test.go b/client/mergediff_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package client
 

diff --git a/client/mergediff_nolinux_test.go b/client/mergediff_nolinux_test.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package client
 

diff --git a/cmd/buildctl/main_unix.go b/cmd/buildctl/main_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 

diff --git a/cmd/buildkitd/config/gcpolicy_unix.go b/cmd/buildkitd/config/gcpolicy_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package config
 

diff --git a/cmd/buildkitd/config/gcpolicy_windows.go b/cmd/buildkitd/config/gcpolicy_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package config
 

diff --git a/cmd/buildkitd/main_containerd_worker_unix.go b/cmd/buildkitd/main_containerd_worker_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 

diff --git a/cmd/buildkitd/main_oci_worker.go b/cmd/buildkitd/main_oci_worker.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package main
 

diff --git a/cmd/buildkitd/main_unix.go b/cmd/buildkitd/main_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 

diff --git a/cmd/buildkitd/main_windows.go b/cmd/buildkitd/main_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 

diff --git a/cmd/buildkitd/service_unix.go b/cmd/buildkitd/service_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 

diff --git a/errdefs/internal_linux.go b/errdefs/internal_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package errdefs
 

diff --git a/errdefs/internal_nolinux.go b/errdefs/internal_nolinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package errdefs
 

diff --git a/examples/gobuild/main.go b/examples/gobuild/main.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/executor/containerdexecutor/executor_unix.go b/executor/containerdexecutor/executor_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package containerdexecutor
 

diff --git a/executor/oci/spec_windows.go b/executor/oci/spec_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package oci
 

diff --git a/executor/resources/monitor_linux.go b/executor/resources/monitor_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package resources
 

diff --git a/executor/resources/monitor_nolinux.go b/executor/resources/monitor_nolinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package resources
 

diff --git a/executor/runcexecutor/executor.go b/executor/runcexecutor/executor.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package runcexecutor
 

diff --git a/exporter/containerimage/patch.go b/exporter/containerimage/patch.go
@@ -1,5 +1,4 @@
 //go:build !nydus
-// +build !nydus
 
 package containerimage
 

diff --git a/exporter/containerimage/patch_nydus.go b/exporter/containerimage/patch_nydus.go
@@ -1,5 +1,4 @@
 //go:build nydus
-// +build nydus
 
 package containerimage
 

diff --git a/exporter/tar/export_unix.go b/exporter/tar/export_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package local
 

diff --git a/frontend/dockerfile/dockerfile2llb/convert_norunsecurity.go b/frontend/dockerfile/dockerfile2llb/convert_norunsecurity.go
@@ -1,5 +1,4 @@
 //go:build !dfrunsecurity
-// +build !dfrunsecurity
 
 package dockerfile2llb
 

diff --git a/frontend/dockerfile/dockerfile2llb/convert_runsecurity.go b/frontend/dockerfile/dockerfile2llb/convert_runsecurity.go
@@ -1,5 +1,4 @@
 //go:build dfrunsecurity
-// +build dfrunsecurity
 
 package dockerfile2llb
 

diff --git a/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_disabled.go b/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_disabled.go
@@ -1,5 +1,4 @@
 //go:build !dfcopychmodnonoctal
-// +build !dfcopychmodnonoctal
 
 package dockerfile2llb
 

diff --git a/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_enabled.go b/frontend/dockerfile/dockerfile2llb/copy_chmod_non_octal_enabled.go
@@ -1,5 +1,4 @@
 //go:build dfcopychmodnonoctal
-// +build dfcopychmodnonoctal
 
 package dockerfile2llb
 

diff --git a/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go b/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go
@@ -1,5 +1,4 @@
 //go:build dfexcludepatterns
-// +build dfexcludepatterns
 
 package dockerfile2llb
 

diff --git a/frontend/dockerfile/dockerfile_chmod_non_octal_test.go b/frontend/dockerfile/dockerfile_chmod_non_octal_test.go
@@ -1,5 +1,4 @@
 //go:build dfcopychmodnonoctal
-// +build dfcopychmodnonoctal
 
 package dockerfile
 

diff --git a/frontend/dockerfile/dockerfile_parents_test.go b/frontend/dockerfile/dockerfile_parents_test.go
@@ -1,5 +1,4 @@
 //go:build dfparents
-// +build dfparents
 
 package dockerfile
 

diff --git a/frontend/dockerfile/dockerfile_runsecurity_test.go b/frontend/dockerfile/dockerfile_runsecurity_test.go
@@ -1,5 +1,4 @@
 //go:build dfrunsecurity
-// +build dfrunsecurity
 
 package dockerfile
 

diff --git a/frontend/dockerfile/exclude_patterns_test.go b/frontend/dockerfile/exclude_patterns_test.go
@@ -1,5 +1,4 @@
 //go:build dfexcludepatterns
-// +build dfexcludepatterns
 
 package dockerfile
 

diff --git a/frontend/dockerfile/instructions/commands_runsecurity.go b/frontend/dockerfile/instructions/commands_runsecurity.go
@@ -1,5 +1,4 @@
 //go:build dfrunsecurity
-// +build dfrunsecurity
 
 package instructions
 

diff --git a/frontend/dockerfile/instructions/errors_unix.go b/frontend/dockerfile/instructions/errors_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package instructions
 

diff --git a/frontend/dockerfile/instructions/exclude_pattern_feature.go b/frontend/dockerfile/instructions/exclude_pattern_feature.go
@@ -1,5 +1,4 @@
 //go:build dfexcludepatterns
-// +build dfexcludepatterns
 
 package instructions
 

diff --git a/frontend/dockerfile/instructions/parse_parents.go b/frontend/dockerfile/instructions/parse_parents.go
@@ -1,5 +1,4 @@
 //go:build dfparents
-// +build dfparents
 
 package instructions
 

diff --git a/frontend/dockerfile/linter/generate.go b/frontend/dockerfile/linter/generate.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/frontend/dockerfile/shell/equal_env_unix.go b/frontend/dockerfile/shell/equal_env_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package shell
 

diff --git a/session/filesync/diffcopy_unix.go b/session/filesync/diffcopy_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package filesync
 

diff --git a/session/filesync/diffcopy_windows.go b/session/filesync/diffcopy_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package filesync
 

diff --git a/session/sshforward/sshprovider/agentprovider_unix.go b/session/sshforward/sshprovider/agentprovider_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package sshprovider
 

diff --git a/session/sshforward/sshprovider/agentprovider_windows.go b/session/sshforward/sshprovider/agentprovider_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package sshprovider
 

diff --git a/snapshot/diffapply_unsupported.go b/snapshot/diffapply_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package snapshot
 

diff --git a/snapshot/snapshotter_test.go b/snapshot/snapshotter_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package snapshot
 

diff --git a/solver/llbsolver/file/backend_unix.go b/solver/llbsolver/file/backend_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package file
 

diff --git a/solver/llbsolver/ops/user_other.go b/solver/llbsolver/ops/user_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package ops
 

diff --git a/source/git/source_unix_test.go b/source/git/source_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package git
 

diff --git a/source/git/source_windows.go b/source/git/source_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package git
 

diff --git a/tools/tools.go b/tools/tools.go
@@ -1,5 +1,4 @@
 //go:build tools
-// +build tools
 
 // Package tools tracks dependencies on binaries not referenced in this codebase.
 // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module

diff --git a/util/appcontext/appcontext_unix.go b/util/appcontext/appcontext_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package appcontext
 

diff --git a/util/appdefaults/appdefaults_unix.go b/util/appdefaults/appdefaults_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package appdefaults
 

diff --git a/util/archutil/386_binary.go b/util/archutil/386_binary.go
@@ -1,5 +1,4 @@
 //go:build !386
-// +build !386
 
 package archutil
 

diff --git a/util/archutil/386_check.go b/util/archutil/386_check.go
@@ -1,5 +1,4 @@
 //go:build !386
-// +build !386
 
 package archutil
 

diff --git a/util/archutil/386_check_386.go b/util/archutil/386_check_386.go
@@ -1,5 +1,4 @@
 //go:build 386
-// +build 386
 
 package archutil
 

diff --git a/util/archutil/amd64_binary.go b/util/archutil/amd64_binary.go
@@ -1,5 +1,4 @@
 //go:build !amd64
-// +build !amd64
 
 package archutil
 

diff --git a/util/archutil/amd64_check.go b/util/archutil/amd64_check.go
@@ -1,5 +1,4 @@
 //go:build !amd64
-// +build !amd64
 
 package archutil
 

diff --git a/util/archutil/amd64_check_amd64.go b/util/archutil/amd64_check_amd64.go
@@ -1,5 +1,4 @@
 //go:build amd64
-// +build amd64
 
 package archutil
 

diff --git a/util/archutil/arm64_binary.go b/util/archutil/arm64_binary.go
@@ -1,5 +1,4 @@
 //go:build !arm64
-// +build !arm64
 
 package archutil
 

diff --git a/util/archutil/arm64_check.go b/util/archutil/arm64_check.go
@@ -1,5 +1,4 @@
 //go:build !arm64
-// +build !arm64
 
 package archutil
 

diff --git a/util/archutil/arm64_check_arm64.go b/util/archutil/arm64_check_arm64.go
@@ -1,5 +1,4 @@
 //go:build arm64
-// +build arm64
 
 package archutil
 

diff --git a/util/archutil/arm_binary.go b/util/archutil/arm_binary.go
@@ -1,5 +1,4 @@
 //go:build !arm
-// +build !arm
 
 package archutil