diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1112cba..877843a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,12 +56,18 @@ jobs: path: ${{ steps.generate-metadata-file.outputs.filepath }} generate-ldflags: - needs: get-product-version + needs: + - get-go-version + - get-product-version runs-on: ubuntu-20.04 outputs: ldflags: ${{ steps.generate-ldflags.outputs.ldflags }} steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + - name: Setup go + uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 + with: + go-version: ${{ needs.get-go-version.outputs.go-version }} - name: Generate ld flags id: generate-ldflags run: | diff --git a/.go-version b/.go-version index ce2dd53..6fee2fe 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.5 +1.22.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 06333a8..af01ab0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ IMPROVEMENTS: BUG FIXES: * cli: Fix non-interactive UI debug print output [[GH-508](https://github.com/hashicorp/nomad-pack/pull/508)] +DEPENDENCY CHANGES: +* build: Update Go version to 1.22 [[GH-509](https://github.com/hashicorp/nomad-pack/pull/509)] + ## 0.1.1 (April 26,2024) IMPROVEMENTS: diff --git a/Dockerfile b/Dockerfile index 85005e0..4ce91d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ # devbuild compiles the binary # ----------------------------------- -FROM golang:1.21 AS devbuild +FROM golang:1.22 AS devbuild # Disable CGO to make sure we build static binaries ENV CGO_ENABLED=0 diff --git a/go.mod b/go.mod index 403422c..04f5e44 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/nomad-pack -go 1.21 +go 1.22 // This replace is required by Nomad or the dependency won't build correctly. replace github.com/hashicorp/hcl => github.com/hashicorp/hcl v1.0.1-0.20201016140508-a07e7d50bbee