Modernize build tags

mattpass · Mar 29, 2022 · b88eb72 · b88eb72
1 parent 32847f7
commit b88eb72
Show file tree

Hide file tree

Showing 19 changed files with 18 additions and 27 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -14,9 +14,6 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: [1.14, 1.16]
     steps:
     - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
       with:
@@ -25,7 +22,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
       with:
-        go-version: ${{ matrix.go }}
+        go-version: 1.18
 
     - name: Setup Ruby
       uses: ruby/setup-ruby@bd94d6a504586da892a5753afdd1480096ed30df # v1.62.0

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -14,9 +14,6 @@ permissions:
 jobs:
   build:
     runs-on: macos-latest
-    strategy:
-      matrix:
-        go: [1.14, 1.16]
     steps:
     - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
       with:
@@ -25,7 +22,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
       with:
-        go-version: ${{ matrix.go }}
+        go-version: 1.18
 
     - name: Setup Ruby
       uses: ruby/setup-ruby@bd94d6a504586da892a5753afdd1480096ed30df # v1.62.0

diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+golang 1.18
diff --git a/src/protector/protector.go b/src/protector/protector.go
@@ -1,4 +1,4 @@
-// +build !openbsd
+//go:build !openbsd
 
 package protector
 

diff --git a/src/protector/protector_openbsd.go b/src/protector/protector_openbsd.go
@@ -1,4 +1,4 @@
-// +build openbsd
+//go:build openbsd
 
 package protector
 

diff --git a/src/result_others.go b/src/result_others.go
@@ -1,4 +1,4 @@
-// +build !386,!amd64
+//go:build !386 && !amd64
 
 package fzf
 

diff --git a/src/result_test.go b/src/result_test.go
@@ -1,5 +1,3 @@
-// +build !tcell
-
 package fzf
 
 import (

diff --git a/src/result_x86.go b/src/result_x86.go
@@ -1,4 +1,4 @@
-// +build 386 amd64
+//go:build 386 || amd64
 
 package fzf
 

diff --git a/src/terminal_unix.go b/src/terminal_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package fzf
 

diff --git a/src/terminal_windows.go b/src/terminal_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package fzf
 

diff --git a/src/tui/dummy.go b/src/tui/dummy.go
@@ -1,6 +1,4 @@
-// +build !ncurses
-// +build !tcell
-// +build !windows
+//go:build !tcell && !windows
 
 package tui
 

diff --git a/src/tui/light_unix.go b/src/tui/light_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package tui
 

diff --git a/src/tui/light_windows.go b/src/tui/light_windows.go
@@ -1,4 +1,4 @@
-//+build windows
+//go:build windows
 
 package tui
 

diff --git a/src/tui/tcell.go b/src/tui/tcell.go
@@ -1,4 +1,4 @@
-// +build tcell windows
+//go:build tcell || windows
 
 package tui
 

diff --git a/src/tui/tcell_test.go b/src/tui/tcell_test.go
@@ -1,4 +1,4 @@
-// +build tcell windows
+//go:build tcell || windows
 
 package tui
 

diff --git a/src/tui/ttyname_unix.go b/src/tui/ttyname_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package tui
 

diff --git a/src/tui/ttyname_windows.go b/src/tui/ttyname_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package tui
 

diff --git a/src/util/util_unix.go b/src/util/util_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package util
 

diff --git a/src/util/util_windows.go b/src/util/util_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package util