From 887d31ffaf33c48d2cd5ed80c5cf04364b842e80 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 16 Jul 2022 12:10:51 -0400 Subject: [PATCH] Target minimum go 1.18 in v3-dev-main --- .github/workflows/cli.yml | 2 +- sliceflag.go | 3 --- sliceflag_pre18.go | 10 ---------- sliceflag_test.go | 3 --- 4 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 sliceflag_pre18.go diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 470a8aa7c5..1e4a51f221 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - go: [1.16.x, 1.17.x, 1.18.x] + go: [1.18.x] name: ${{ matrix.os }} @ Go ${{ matrix.go }} runs-on: ${{ matrix.os }} steps: diff --git a/sliceflag.go b/sliceflag.go index 7dea3576a3..b2ca59041f 100644 --- a/sliceflag.go +++ b/sliceflag.go @@ -1,6 +1,3 @@ -//go:build go1.18 -// +build go1.18 - package cli import ( diff --git a/sliceflag_pre18.go b/sliceflag_pre18.go deleted file mode 100644 index 1173ae7402..0000000000 --- a/sliceflag_pre18.go +++ /dev/null @@ -1,10 +0,0 @@ -//go:build !go1.18 -// +build !go1.18 - -package cli - -import ( - "flag" -) - -func unwrapFlagValue(v flag.Value) flag.Value { return v } diff --git a/sliceflag_test.go b/sliceflag_test.go index 179020b14f..8ff905583b 100644 --- a/sliceflag_test.go +++ b/sliceflag_test.go @@ -1,6 +1,3 @@ -//go:build go1.18 -// +build go1.18 - package cli import (