Merge pull request #137 from alexandear/fix-buildtag

Delete obsolete // +build lines
otiai10 · Jan 18, 2024 · 441a9cd · 441a9cd
2 parents 80e4f76 + 83176c0
commit 441a9cd
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 19 deletions.
diff --git a/copy_namedpipes.go b/copy_namedpipes.go
@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !netbsd && !aix && !illumos && !solaris && !js
-// +build !windows,!plan9,!netbsd,!aix,!illumos,!solaris,!js
 
 package copy
 

diff --git a/copy_namedpipes_x.go b/copy_namedpipes_x.go
@@ -1,5 +1,4 @@
 //go:build windows || plan9 || netbsd || aix || illumos || solaris || js
-// +build windows plan9 netbsd aix illumos solaris js
 
 package copy
 

diff --git a/patherror_test.go b/patherror_test.go
@@ -1,3 +1,5 @@
+//go:build go1.16
+
 package copy
 
 import (

diff --git a/preserve_ltimes.go b/preserve_ltimes.go
@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package copy
 

diff --git a/preserve_ltimes_test.go b/preserve_ltimes_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package copy
 

diff --git a/preserve_ltimes_x.go b/preserve_ltimes_x.go
@@ -1,5 +1,4 @@
 //go:build windows || js || plan9
-// +build windows js plan9
 
 package copy
 

diff --git a/preserve_ltimes_x_test.go b/preserve_ltimes_x_test.go
@@ -1,5 +1,4 @@
 //go:build windows || js || plan9
-// +build windows js plan9
 
 package copy
 

diff --git a/preserve_owner.go b/preserve_owner.go
@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package copy
 

diff --git a/preserve_owner_x.go b/preserve_owner_x.go
@@ -1,5 +1,4 @@
 //go:build windows || plan9
-// +build windows plan9
 
 package copy
 

diff --git a/stat_times.go b/stat_times.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin && !freebsd && !plan9 && !netbsd && !js
-// +build !windows,!darwin,!freebsd,!plan9,!netbsd,!js
 
 // TODO: add more runtimes
 

diff --git a/stat_times_darwin.go b/stat_times_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 package copy
 

diff --git a/stat_times_freebsd.go b/stat_times_freebsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package copy
 

diff --git a/stat_times_js.go b/stat_times_js.go
@@ -1,5 +1,4 @@
 //go:build js
-// +build js
 
 package copy
 

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

diff --git a/stat_times_x.go b/stat_times_x.go
@@ -1,5 +1,4 @@
 //go:build plan9 || netbsd
-// +build plan9 netbsd
 
 package copy
 

diff --git a/symlink_test.go b/symlink_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !netbsd && !aix && !illumos && !solaris && !js
-// +build !windows,!plan9,!netbsd,!aix,!illumos,!solaris,!js
 
 package copy
 

diff --git a/symlink_test_x.go b/symlink_test_x.go
@@ -1,5 +1,4 @@
 //go:build windows || plan9 || netbsd || aix || illumos || solaris || js
-// +build windows plan9 netbsd aix illumos solaris js
 
 package copy
 

diff --git a/test/images/alpine.Dockerfile b/test/images/alpine.Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.16
 
 WORKDIR /app
 

diff --git a/test_setup_test.go b/test_setup_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !netbsd && !aix && !illumos && !solaris && !js
-// +build !windows,!plan9,!netbsd,!aix,!illumos,!solaris,!js
 
 package copy
 

diff --git a/test_setup_x_test.go b/test_setup_x_test.go
@@ -1,5 +1,4 @@
 //go:build windows || plan9 || netbsd || aix || illumos || solaris || js
-// +build windows plan9 netbsd aix illumos solaris js
 
 package copy