Merge pull request #120 from tmccombs/build-fixes

Build fixes

Author: tmccombs

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         go:
-          - "~1.22.5"
+          - "~1.24.1"
     steps:
       - name: Setup
         uses: actions/setup-go@v5

.goreleaser.yaml

@@ -17,7 +17,7 @@ builds:
       - darwin
 
 archives:
-  - formats: [ 'tar.gz' ]
+  - formats: [ 'tar.gz', 'binary' ]
     # this name template makes the OS and Arch compatible with the results of `uname`.
     name_template: >-
       {{ .ProjectName }}_
@@ -27,6 +27,9 @@ archives:
     format_overrides:
       - goos: windows
         formats: [ 'zip' ]
+    files:
+      - LICENSE
+      - README.md
 
 dockers:
   - image_templates:

CHANGELOG.md

@@ -1,3 +1,48 @@
+# 0.6.7
+
+- Fix `-version` flag that broke in 0.6.6
+- Include raw binary files in github release again
+- Change github release artifact naming to be consistent with before 0.6.6
+
+### Warning
+
+I will probably remove the raw binary artifacts at some point, possibly in 0.7.0
+
+# 0.6.6
+
+- Use goreleaser to do deploys.
+
+### Warning
+
+This release had some significant changes in how the artifacts were packaged, and doesn't have any meaningful changes to the
+package itself. I recommend not using this release.
+
+# 0.6.5
+
+- Update hcl dependency. Should now correctly parse terraform provider functions
+
+# 0.6.4
+
+- Add windows arm64 binary to releases
+
+# 0.6.3
+
+- Properly escape `$${` and `%%{`
+
+# 0.6.2
+
+- Update go-cty and hcl/v2 deps
+- Add arm64 docker image
+
+# 0.6.1
+
+- Increase dependency versions
+
+# 0.6.0
+
+- Add -version flag
+- Update hcl version
+
 # 0.5.0
 
 - Make a few functions public in library

go.mod

@@ -1,8 +1,8 @@
 module github.com/tmccombs/hcl2json
 
-go 1.22.0
+go 1.23.0
 
-toolchain go1.23.4
+toolchain go1.24.1
 
 require (
 	github.com/hashicorp/hcl/v2 v2.23.0
@@ -14,8 +14,8 @@ require (
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/go-test/deep v1.0.7 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/tools v0.28.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/tools v0.31.0 // indirect
 )

go.sum

@@ -16,11 +16,11 @@ github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70
 github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
-golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
+golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=

main.go

@@ -12,7 +12,7 @@ import (
 	"github.com/tmccombs/hcl2json/convert"
 )
 
-var Version string = "devel"
+var version string = "devel"
 
 const versionUsage = "Print the version of hcl2json"
 
@@ -28,7 +28,7 @@ func main() {
 	flag.Parse()
 
 	if printVersion {
-		fmt.Println(Version)
+		fmt.Println(version)
 		os.Exit(0)
 	}