diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba7432b..836abae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: DIR="$(mktemp -d)" mkdir "$DIR/age" cp "$RUNNER_TEMP/LICENSE" "$DIR/age" - go build -o "$DIR/age" -ldflags "-X main.Version=$VERSION" -trimpath ./cmd/... + go build -o "$DIR/age" -trimpath ./cmd/... if [ "$GOOS" == "windows" ]; then sudo apt-get update && sudo apt-get install -y osslsigncode if [ -n "${{ secrets.SIGN_PASS }}" ]; then diff --git a/cmd/age-keygen/keygen.go b/cmd/age-keygen/keygen.go index 549d3cf..0913de6 100644 --- a/cmd/age-keygen/keygen.go +++ b/cmd/age-keygen/keygen.go @@ -48,11 +48,6 @@ Examples: $ age-keygen -y key.txt age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p` -// Version can be set at link time to override debug.BuildInfo.Main.Version, -// which is "(devel)" when building from within the module. See -// golang.org/issue/29814 and golang.org/issue/29228. -var Version string - func main() { log.SetFlags(0) flag.Usage = func() { fmt.Fprintf(os.Stderr, "%s\n", usage) } @@ -74,10 +69,6 @@ func main() { errorf("too many arguments") } if versionFlag { - if Version != "" { - fmt.Println(Version) - return - } if buildInfo, ok := debug.ReadBuildInfo(); ok { fmt.Println(buildInfo.Main.Version) return diff --git a/cmd/age/age.go b/cmd/age/age.go index e5d17e2..6992dee 100644 --- a/cmd/age/age.go +++ b/cmd/age/age.go @@ -63,11 +63,6 @@ Example: $ tar cvz ~/data | age -r age1ql3z7hjy54pw3hyww5ayyfg7zqgvc7w3j2elw8zmrj2kg5sfn9aqmcac8p > data.tar.gz.age $ age --decrypt -i key.txt -o data.tar.gz data.tar.gz.age` -// Version can be set at link time to override debug.BuildInfo.Main.Version, -// which is "(devel)" when building from within the module. See -// golang.org/issue/29814 and golang.org/issue/29228. -var Version string - // stdinInUse is used to ensure only one of input, recipients, or identities // file is read from stdin. It's a singleton like os.Stdin. var stdinInUse bool @@ -137,10 +132,6 @@ func main() { flag.Parse() if versionFlag { - if Version != "" { - fmt.Println(Version) - return - } if buildInfo, ok := debug.ReadBuildInfo(); ok { // TODO: use buildInfo.Settings to prepare a pseudoversion such as // v0.0.0-20210817164053-32db794688a5+dirty on Go 1.18+.